Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 7000, 7027 - Fix new fuel modal percentage, load custom materials on start #7029

Merged
merged 1 commit into from
Sep 30, 2024
Merged

Issue 7000, 7027 - Fix new fuel modal percentage, load custom materials on start #7029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/app/core/core.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ export class CoreComponent implements OnInit {
private automaticBackupService: AutomaticBackupService,
private applicationInstanceDbService: ApplicationInstanceDbService,
private importBackupModalService: ImportBackupModalService,
private sqlDbApiService: SqlDbApiService,
private inventoryDbService: InventoryDbService) {
}

Expand Down Expand Up @@ -186,6 +187,7 @@ export class CoreComponent implements OnInit {
this.calculatorDbService.setAll(initializedData.calculators);
this.inventoryDbService.setAll(initializedData.inventoryItems);
this.idbStarted = true;
this.sqlDbApiService.initCustomDbMaterials();
this.changeDetectorRef.detectChanges();
if (this.electronService.isElectron) {
this.automaticBackupService.saveVersionedBackup();
Expand Down
14 changes: 7 additions & 7 deletions ...tom-solid-liquid-flue-gas-materials/custom-solid-liquid-flue-gas-materials.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,39 +13,39 @@
Carbon:
</td>
<td>
{{solidLiquidFlueGasMaterial.carbon * 100 | sigFigs: '3'}} %
{{solidLiquidFlueGasMaterial.carbon | sigFigs: '3'}} %
</td>
</tr>
<tr>
<td>
Hydrogen:
</td>
<td>
{{solidLiquidFlueGasMaterial.hydrogen * 100 | sigFigs: '3'}} %
{{solidLiquidFlueGasMaterial.hydrogen | sigFigs: '3'}} %
</td>
</tr>
<tr>
<td>
Inert Ash:
</td>
<td>
{{solidLiquidFlueGasMaterial.inertAsh * 100 | sigFigs: '3'}} %
{{solidLiquidFlueGasMaterial.inertAsh | sigFigs: '3'}} %
</td>
</tr>
<tr>
<td>
Moisture:
</td>
<td>
{{solidLiquidFlueGasMaterial.moisture * 100 | sigFigs: '3'}} %
{{solidLiquidFlueGasMaterial.moisture | sigFigs: '3'}} %
</td>
</tr>
<tr>
<td>
Nitrogen:
</td>
<td>
{{solidLiquidFlueGasMaterial.nitrogen * 100 | sigFigs: '3'}} %
{{solidLiquidFlueGasMaterial.nitrogen | sigFigs: '3'}} %
</td>
</tr>
<tr>
Expand All @@ -54,15 +54,15 @@
<sub>2</sub>:
</td>
<td>
{{solidLiquidFlueGasMaterial.o2 * 100 | sigFigs: '3'}} %
{{solidLiquidFlueGasMaterial.o2 | sigFigs: '3'}} %
</td>
</tr>
<tr>
<td>
Sulphur:
</td>
<td>
{{solidLiquidFlueGasMaterial.sulphur * 100 | sigFigs: '3'}} %
{{solidLiquidFlueGasMaterial.sulphur | sigFigs: '3'}} %
</td>
</tr>

Expand Down
3 changes: 2 additions & 1 deletion src/app/suiteDb/solid-liquid-flue-gas-material/solid-liquid-flue-gas-material.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,12 @@ export class SolidLiquidFlueGasMaterialComponent implements OnInit {

async addMaterial() {
if (this.canAdd) {
this.convertDecimals();
this.canAdd = false;
if (this.settings.unitsOfMeasure === 'Metric') {
this.newMaterial.heatingValue = this.convertUnitsService.value(this.newMaterial.heatingValue).from('kJkg').to('btuLb');
}

// * db insert converts user input percentage to fraction
let suiteDbResult = this.sqlDbApiService.insertSolidLiquidFlueGasMaterial(this.newMaterial);
if (suiteDbResult == true) {
await firstValueFrom(this.solidLiquidMaterialDbService.addWithObservable(this.newMaterial))
Expand Down