build_app
This commit is contained in:
parent
84ce13f34c
commit
d53274c3be
@ -81,6 +81,21 @@ addCustomMenu( "Manufacturer","Manufacturer", "Master");
|
||||
addCustomMenu( "Deployment_type","Deployment_type", "Master");
|
||||
|
||||
|
||||
addCustomMenu( "Customer_information","Customer_information", "Transcations");
|
||||
|
||||
|
||||
addCustomMenu( "Types","Types", "Master");
|
||||
|
||||
|
||||
addCustomMenu( "Product","Product", "Master");
|
||||
|
||||
|
||||
addCustomMenu( "Manufacturer","Manufacturer", "Master");
|
||||
|
||||
|
||||
addCustomMenu( "Deployment_type","Deployment_type", "Master");
|
||||
|
||||
|
||||
addCustomMenu( "Customer_information","Customer_information", "Transcations");
|
||||
|
||||
|
||||
|
||||
@ -76,7 +76,11 @@ private String deployment_typename;
|
||||
|
||||
|
||||
|
||||
private boolean busbar_monitoring;
|
||||
private boolean apfc_panel_monitoring;
|
||||
|
||||
|
||||
|
||||
private boolean dg_monitoring___without_fule;
|
||||
|
||||
|
||||
|
||||
@ -88,15 +92,11 @@ private boolean dg_monitoring___with_fule;
|
||||
|
||||
|
||||
|
||||
private boolean dg_monitoring___without_fule;
|
||||
|
||||
|
||||
|
||||
private boolean ups_monitoring;
|
||||
|
||||
|
||||
|
||||
private boolean apfc_panel_monitoring;
|
||||
private boolean busbar_monitoring;
|
||||
|
||||
|
||||
|
||||
|
||||
@ -201,11 +201,7 @@ old.setDeployment_type(data.getDeployment_type());
|
||||
|
||||
|
||||
|
||||
old.setApfc_panel_monitoring(data.isApfc_panel_monitoring());
|
||||
|
||||
|
||||
|
||||
old.setDg_monitoring___with_fule(data.isDg_monitoring___with_fule());
|
||||
old.setBusbar_monitoring(data.isBusbar_monitoring());
|
||||
|
||||
|
||||
|
||||
@ -213,6 +209,10 @@ old.setActive_energy(data.isActive_energy());
|
||||
|
||||
|
||||
|
||||
old.setDg_monitoring___with_fule(data.isDg_monitoring___with_fule());
|
||||
|
||||
|
||||
|
||||
old.setDg_monitoring___without_fule(data.isDg_monitoring___without_fule());
|
||||
|
||||
|
||||
@ -221,11 +221,7 @@ old.setUps_monitoring(data.isUps_monitoring());
|
||||
|
||||
|
||||
|
||||
old.setBusbar_monitoring(data.isBusbar_monitoring());
|
||||
|
||||
|
||||
|
||||
old.setWater_management_stp_etp(data.isWater_management_stp_etp());
|
||||
old.setApfc_panel_monitoring(data.isApfc_panel_monitoring());
|
||||
|
||||
|
||||
|
||||
@ -233,6 +229,10 @@ old.setLt_panel_monitoring(data.isLt_panel_monitoring());
|
||||
|
||||
|
||||
|
||||
old.setWater_management_stp_etp(data.isWater_management_stp_etp());
|
||||
|
||||
|
||||
|
||||
old.setHt_panel_monitoring(data.isHt_panel_monitoring());
|
||||
|
||||
|
||||
|
||||
@ -61,7 +61,7 @@
|
||||
|
||||
|
||||
|
||||
<clr-dg-column [clrDgField]="' busbar_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> busbar monitoring
|
||||
<clr-dg-column [clrDgField]="' compressed_air__gag_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> compressed air -gag monitoring
|
||||
</ng-container></clr-dg-column>
|
||||
|
||||
|
||||
@ -91,12 +91,12 @@
|
||||
|
||||
|
||||
|
||||
<clr-dg-column [clrDgField]="' lt_panel_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> lt panel monitoring
|
||||
<clr-dg-column [clrDgField]="' busbar_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> busbar monitoring
|
||||
</ng-container></clr-dg-column>
|
||||
|
||||
|
||||
|
||||
<clr-dg-column [clrDgField]="' water_management_stp_etp'"> <ng-container *clrDgHideableColumn="{hidden: false}"> water management-stp/etp
|
||||
<clr-dg-column [clrDgField]="' lt_panel_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> lt panel monitoring
|
||||
</ng-container></clr-dg-column>
|
||||
|
||||
|
||||
@ -106,7 +106,7 @@
|
||||
|
||||
|
||||
|
||||
<clr-dg-column [clrDgField]="' compressed_air__gag_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> compressed air -gag monitoring
|
||||
<clr-dg-column [clrDgField]="' water_management_stp_etp'"> <ng-container *clrDgHideableColumn="{hidden: false}"> water management-stp/etp
|
||||
</ng-container></clr-dg-column>
|
||||
|
||||
|
||||
@ -171,11 +171,11 @@
|
||||
|
||||
|
||||
|
||||
<clr-dg-cell>{{user.dg_monitoring___with_fule}}</clr-dg-cell>
|
||||
<clr-dg-cell>{{user.active_energy}}</clr-dg-cell>
|
||||
|
||||
|
||||
|
||||
<clr-dg-cell>{{user.active_energy}}</clr-dg-cell>
|
||||
<clr-dg-cell>{{user.dg_monitoring___with_fule}}</clr-dg-cell>
|
||||
|
||||
|
||||
|
||||
@ -211,11 +211,11 @@
|
||||
|
||||
|
||||
|
||||
<clr-dg-cell>{{user.water_management_stp_etp}}</clr-dg-cell>
|
||||
<clr-dg-cell>{{user.water_management_water_monitoring}}</clr-dg-cell>
|
||||
|
||||
|
||||
|
||||
<clr-dg-cell>{{user.water_management_water_monitoring}}</clr-dg-cell>
|
||||
<clr-dg-cell>{{user.water_management_stp_etp}}</clr-dg-cell>
|
||||
|
||||
|
||||
|
||||
@ -538,8 +538,8 @@
|
||||
|
||||
|
||||
|
||||
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="apfc_panel_monitoring" name="apfc_panel_monitoring" [(ngModel)]="rowSelected.apfc_panel_monitoring" class="clr-checkbox" />
|
||||
<label for="apfc_panel_monitoring" class="clr-control-label"> apfc panel monitoring</label> </div>
|
||||
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="dg_monitoring___with_fule" name="dg_monitoring___with_fule" [(ngModel)]="rowSelected.dg_monitoring___with_fule" class="clr-checkbox" />
|
||||
<label for="dg_monitoring___with_fule" class="clr-control-label"> dg monitoring - with fule</label> </div>
|
||||
|
||||
|
||||
|
||||
@ -552,13 +552,6 @@
|
||||
|
||||
|
||||
|
||||
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="dg_monitoring___with_fule" name="dg_monitoring___with_fule" [(ngModel)]="rowSelected.dg_monitoring___with_fule" class="clr-checkbox" />
|
||||
<label for="dg_monitoring___with_fule" class="clr-control-label"> dg monitoring - with fule</label> </div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="dg_monitoring___without_fule" name="dg_monitoring___without_fule" [(ngModel)]="rowSelected.dg_monitoring___without_fule" class="clr-checkbox" />
|
||||
<label for="dg_monitoring___without_fule" class="clr-control-label"> dg monitoring - without fule</label> </div>
|
||||
|
||||
@ -566,6 +559,13 @@
|
||||
|
||||
|
||||
|
||||
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="water_management_stp_etp" name="water_management_stp_etp" [(ngModel)]="rowSelected.water_management_stp_etp" class="clr-checkbox" />
|
||||
<label for="water_management_stp_etp" class="clr-control-label"> water management-stp/etp</label> </div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="ups_monitoring" name="ups_monitoring" [(ngModel)]="rowSelected.ups_monitoring" class="clr-checkbox" />
|
||||
<label for="ups_monitoring" class="clr-control-label"> ups monitoring</label> </div>
|
||||
|
||||
@ -573,6 +573,13 @@
|
||||
|
||||
|
||||
|
||||
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="apfc_panel_monitoring" name="apfc_panel_monitoring" [(ngModel)]="rowSelected.apfc_panel_monitoring" class="clr-checkbox" />
|
||||
<label for="apfc_panel_monitoring" class="clr-control-label"> apfc panel monitoring</label> </div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="busbar_monitoring" name="busbar_monitoring" [(ngModel)]="rowSelected.busbar_monitoring" class="clr-checkbox" />
|
||||
<label for="busbar_monitoring" class="clr-control-label"> busbar monitoring</label> </div>
|
||||
|
||||
@ -601,13 +608,6 @@
|
||||
|
||||
|
||||
|
||||
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="water_management_stp_etp" name="water_management_stp_etp" [(ngModel)]="rowSelected.water_management_stp_etp" class="clr-checkbox" />
|
||||
<label for="water_management_stp_etp" class="clr-control-label"> water management-stp/etp</label> </div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="compressed_air___lpg_n2_o2_co2" name="compressed_air___lpg_n2_o2_co2" [(ngModel)]="rowSelected.compressed_air___lpg_n2_o2_co2" class="clr-checkbox" />
|
||||
<label for="compressed_air___lpg_n2_o2_co2" class="clr-control-label"> compressed air - lpg/n2/o2/co2</label> </div>
|
||||
|
||||
@ -842,12 +842,24 @@
|
||||
|
||||
|
||||
|
||||
<div class="clr-checkbox-wrapper">
|
||||
<input type="checkbox" id="ht_panel_monitoring" formControlName="ht_panel_monitoring" class="clr-checkbox" />
|
||||
<label for="ht_panel_monitoring" class="clr-control-label">ht panel monitoring</label> </div>
|
||||
|
||||
|
||||
|
||||
<div class="clr-checkbox-wrapper">
|
||||
<input type="checkbox" id="active_energy" formControlName="active_energy" class="clr-checkbox" />
|
||||
<label for="active_energy" class="clr-control-label">active energy</label> </div>
|
||||
|
||||
|
||||
|
||||
<div class="clr-checkbox-wrapper">
|
||||
<input type="checkbox" id="water_management_stp_etp" formControlName="water_management_stp_etp" class="clr-checkbox" />
|
||||
<label for="water_management_stp_etp" class="clr-control-label">water management-stp/etp</label> </div>
|
||||
|
||||
|
||||
|
||||
<div class="clr-checkbox-wrapper">
|
||||
<input type="checkbox" id="dg_monitoring___with_fule" formControlName="dg_monitoring___with_fule" class="clr-checkbox" />
|
||||
<label for="dg_monitoring___with_fule" class="clr-control-label">dg monitoring - with fule</label> </div>
|
||||
@ -884,18 +896,6 @@
|
||||
|
||||
|
||||
|
||||
<div class="clr-checkbox-wrapper">
|
||||
<input type="checkbox" id="water_management_stp_etp" formControlName="water_management_stp_etp" class="clr-checkbox" />
|
||||
<label for="water_management_stp_etp" class="clr-control-label">water management-stp/etp</label> </div>
|
||||
|
||||
|
||||
|
||||
<div class="clr-checkbox-wrapper">
|
||||
<input type="checkbox" id="ht_panel_monitoring" formControlName="ht_panel_monitoring" class="clr-checkbox" />
|
||||
<label for="ht_panel_monitoring" class="clr-control-label">ht panel monitoring</label> </div>
|
||||
|
||||
|
||||
|
||||
<div class="clr-checkbox-wrapper">
|
||||
<input type="checkbox" id="compressed_air__gag_monitoring" formControlName="compressed_air__gag_monitoring" class="clr-checkbox" />
|
||||
<label for="compressed_air__gag_monitoring" class="clr-control-label">compressed air -gag monitoring</label> </div>
|
||||
|
||||
@ -86,10 +86,6 @@ deployment_type : [null],
|
||||
|
||||
|
||||
|
||||
ups_monitoring:[false],
|
||||
|
||||
|
||||
|
||||
active_energy:[false],
|
||||
|
||||
|
||||
@ -102,6 +98,10 @@ dg_monitoring___without_fule:[false],
|
||||
|
||||
|
||||
|
||||
ups_monitoring:[false],
|
||||
|
||||
|
||||
|
||||
apfc_panel_monitoring:[false],
|
||||
|
||||
|
||||
@ -118,11 +118,11 @@ ht_panel_monitoring:[false],
|
||||
|
||||
|
||||
|
||||
water_management_stp_etp:[false],
|
||||
compressed_air__gag_monitoring:[false],
|
||||
|
||||
|
||||
|
||||
compressed_air__gag_monitoring:[false],
|
||||
water_management_stp_etp:[false],
|
||||
|
||||
|
||||
|
||||
@ -631,7 +631,7 @@ console.log(data);
|
||||
|
||||
|
||||
totaltotal;
|
||||
totalcalculateOperators: 'Addition' | 'Subtraction' | 'Multiplication' | 'Division' | 'Concatination' = "Deployment_type"
|
||||
totalcalculateOperators: 'Addition' | 'Subtraction' | 'Multiplication' | 'Division' | 'Concatination' = "deployment_type"
|
||||
onInputChangetotal(mode: 'add' | 'edit') {
|
||||
|
||||
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
import { TypesComponent } from './BuilderComponents/basicp1/Types/Types.component';
|
||||
import { ProductComponent } from './BuilderComponents/basicp1/Product/Product.component';
|
||||
import { ManufacturerComponent } from './BuilderComponents/basicp1/Manufacturer/Manufacturer.component';
|
||||
@ -261,6 +266,16 @@ const routes: Routes = [
|
||||
|
||||
|
||||
// buildercomponents
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
{path:'Types',component:TypesComponent},
|
||||
|
||||
|
||||
|
||||
@ -1,3 +1,8 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
import { TypesComponent } from './BuilderComponents/basicp1/Types/Types.component';
|
||||
import { ProductComponent } from './BuilderComponents/basicp1/Product/Product.component';
|
||||
import { ManufacturerComponent } from './BuilderComponents/basicp1/Manufacturer/Manufacturer.component';
|
||||
@ -134,6 +139,16 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S
|
||||
|
||||
|
||||
// buildercomponents
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
TypesComponent,
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user