build_app

orderestimation0010-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java

@@ -111,6 +111,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"); 
 
 

orderestimation0010-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Customer_information.java

@@ -76,51 +76,51 @@ private String deployment_typename;
 
   
  
-private boolean compressed_air___lpg_n2_o2_co2;
+private Boolean ups_monitoring;
    
 
  
-private boolean active_energy;
+private Boolean active_energy;
    
 
  
-private boolean dg_monitoring___with_fule;
+private Boolean dg_monitoring___with_fule;
    
 
  
-private boolean dg_monitoring___without_fule;
+private Boolean dg_monitoring___without_fule;
    
 
  
-private boolean water_management_stp_etp;
+private Boolean apfc_panel_monitoring;
    
 
  
-private boolean ups_monitoring;
+private Boolean busbar_monitoring;
    
 
  
-private boolean apfc_panel_monitoring;
+private Boolean water_management_stp_etp;
    
 
  
-private boolean busbar_monitoring;
+private Boolean lt_panel_monitoring;
    
 
  
-private boolean lt_panel_monitoring;
+private Boolean ht_panel_monitoring;
    
 
  
-private boolean ht_panel_monitoring;
+private Boolean compressed_air__gag_monitoring;
    
 
  
-private boolean compressed_air__gag_monitoring;
+private Boolean compressed_air___lpg_n2_o2_co2;
    
 
  
-private boolean water_management_water_monitoring;
+private Boolean water_management_water_monitoring;
    
 
 

orderestimation0010-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Customer_informationService.java

@@ -201,51 +201,51 @@ old.setDeployment_type(data.getDeployment_type());
 
   
  
-old.setActive_energy(data.isActive_energy());
+old.setApfc_panel_monitoring(data.getApfc_panel_monitoring());
    
 
  
-old.setDg_monitoring___with_fule(data.isDg_monitoring___with_fule());
+old.setActive_energy(data.getActive_energy());
    
 
  
-old.setDg_monitoring___without_fule(data.isDg_monitoring___without_fule());
+old.setDg_monitoring___with_fule(data.getDg_monitoring___with_fule());
    
 
  
-old.setUps_monitoring(data.isUps_monitoring());
+old.setDg_monitoring___without_fule(data.getDg_monitoring___without_fule());
    
 
  
-old.setApfc_panel_monitoring(data.isApfc_panel_monitoring());
+old.setUps_monitoring(data.getUps_monitoring());
    
 
  
-old.setBusbar_monitoring(data.isBusbar_monitoring());
+old.setBusbar_monitoring(data.getBusbar_monitoring());
    
 
  
-old.setLt_panel_monitoring(data.isLt_panel_monitoring());
+old.setLt_panel_monitoring(data.getLt_panel_monitoring());
    
 
  
-old.setHt_panel_monitoring(data.isHt_panel_monitoring());
+old.setHt_panel_monitoring(data.getHt_panel_monitoring());
    
 
  
-old.setCompressed_air__gag_monitoring(data.isCompressed_air__gag_monitoring());
+old.setCompressed_air__gag_monitoring(data.getCompressed_air__gag_monitoring());
    
 
  
-old.setCompressed_air___lpg_n2_o2_co2(data.isCompressed_air___lpg_n2_o2_co2());
+old.setCompressed_air___lpg_n2_o2_co2(data.getCompressed_air___lpg_n2_o2_co2());
    
 
  
-old.setWater_management_stp_etp(data.isWater_management_stp_etp());
+old.setWater_management_stp_etp(data.getWater_management_stp_etp());
    
 
  
-old.setWater_management_water_monitoring(data.isWater_management_water_monitoring());
+old.setWater_management_water_monitoring(data.getWater_management_water_monitoring());
    
 
 

orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.html

@@ -61,7 +61,7 @@
  
  
  
-<clr-dg-column [clrDgField]="' busbar_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> busbar monitoring
+<clr-dg-column [clrDgField]="' dg_monitoring___with_fule'"> <ng-container *clrDgHideableColumn="{hidden: false}"> dg monitoring - with fule
 						    </ng-container></clr-dg-column>
    
 
@@ -71,11 +71,6 @@
    
 
  
-<clr-dg-column [clrDgField]="' dg_monitoring___with_fule'"> <ng-container *clrDgHideableColumn="{hidden: false}"> dg monitoring - with fule
-						    </ng-container></clr-dg-column>
-   
-
- 
 <clr-dg-column [clrDgField]="' dg_monitoring___without_fule'"> <ng-container *clrDgHideableColumn="{hidden: false}"> dg monitoring - without fule
 						    </ng-container></clr-dg-column>
    
@@ -86,12 +81,17 @@
    
 
  
-<clr-dg-column [clrDgField]="' water_management_stp_etp'"> <ng-container *clrDgHideableColumn="{hidden: false}"> water management-stp/etp
+<clr-dg-column [clrDgField]="' apfc_panel_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> apfc panel monitoring
 						    </ng-container></clr-dg-column>
    
 
  
-<clr-dg-column [clrDgField]="' apfc_panel_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> apfc 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
 						    </ng-container></clr-dg-column>
    
 
@@ -171,10 +171,6 @@
 
 
  
-<clr-dg-cell>{{user.ups_monitoring}}</clr-dg-cell>
-   
-
- 
 <clr-dg-cell>{{user.active_energy}}</clr-dg-cell>
    
 
@@ -187,6 +183,10 @@
    
 
  
+<clr-dg-cell>{{user.ups_monitoring}}</clr-dg-cell>
+   
+
+ 
 <clr-dg-cell>{{user.apfc_panel_monitoring}}</clr-dg-cell>
    
 
@@ -195,6 +195,10 @@
    
 
  
+<clr-dg-cell>{{user.water_management_stp_etp}}</clr-dg-cell>
+   
+
+ 
 <clr-dg-cell>{{user.lt_panel_monitoring}}</clr-dg-cell>
    
 
@@ -214,10 +218,6 @@
 <clr-dg-cell>{{user.water_management_water_monitoring}}</clr-dg-cell>
    
 
- 
-<clr-dg-cell>{{user.water_management_stp_etp}}</clr-dg-cell>
-   
-
 
 
 
@@ -538,6 +538,13 @@
       
  
 
+      <div class="clr-checkbox-wrapper"> <input type="checkbox" id="lt_panel_monitoring" name="lt_panel_monitoring" [(ngModel)]="rowSelected.lt_panel_monitoring" class="clr-checkbox" /> 
+<label for="lt_panel_monitoring" class="clr-control-label"> lt panel monitoring</label> </div>
+
+       
+
+ 
+
       <div class="clr-checkbox-wrapper"> <input type="checkbox" id="active_energy" name="active_energy" [(ngModel)]="rowSelected.active_energy" class="clr-checkbox" /> 
 <label for="active_energy" class="clr-control-label"> active energy</label> </div>
 
@@ -580,13 +587,6 @@
 
  
 
-      <div class="clr-checkbox-wrapper"> <input type="checkbox" id="lt_panel_monitoring" name="lt_panel_monitoring" [(ngModel)]="rowSelected.lt_panel_monitoring" class="clr-checkbox" /> 
-<label for="lt_panel_monitoring" class="clr-control-label"> lt panel monitoring</label> </div>
-
-       
-
- 
-
       <div class="clr-checkbox-wrapper"> <input type="checkbox" id="ht_panel_monitoring" name="ht_panel_monitoring" [(ngModel)]="rowSelected.ht_panel_monitoring" class="clr-checkbox" /> 
 <label for="ht_panel_monitoring" class="clr-control-label"> ht panel monitoring</label> </div>
 
@@ -594,13 +594,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__gag_monitoring" name="compressed_air__gag_monitoring" [(ngModel)]="rowSelected.compressed_air__gag_monitoring" class="clr-checkbox" /> 
 <label for="compressed_air__gag_monitoring" class="clr-control-label"> compressed air -gag monitoring</label> </div>
 
@@ -620,6 +613,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>
   </div>
@@ -843,8 +843,8 @@
                        
  
 			<div class="clr-checkbox-wrapper">           
-				<input type="checkbox" id="ups_monitoring" formControlName="ups_monitoring"  class="clr-checkbox" />       
+				<input type="checkbox" id="dg_monitoring___with_fule" formControlName="dg_monitoring___with_fule"  class="clr-checkbox" />       
-				    <label for="ups_monitoring" class="clr-control-label">ups monitoring</label>  </div>
+				    <label for="dg_monitoring___with_fule" class="clr-control-label">dg monitoring - with fule</label>  </div>
 	                            
 
  
@@ -855,8 +855,8 @@
 
  
 			<div class="clr-checkbox-wrapper">           
-				<input type="checkbox" id="dg_monitoring___with_fule" formControlName="dg_monitoring___with_fule"  class="clr-checkbox" />       
+				<input type="checkbox" id="water_management_stp_etp" formControlName="water_management_stp_etp"  class="clr-checkbox" />       
-				    <label for="dg_monitoring___with_fule" class="clr-control-label">dg monitoring - with fule</label>  </div>
+				    <label for="water_management_stp_etp" class="clr-control-label">water management-stp/etp</label>  </div>
 	                            
 
  
@@ -866,6 +866,12 @@
 	                            
 
  
+			<div class="clr-checkbox-wrapper">           
+				<input type="checkbox" id="ups_monitoring" formControlName="ups_monitoring"  class="clr-checkbox" />       
+				    <label for="ups_monitoring" class="clr-control-label">ups monitoring</label>  </div>
+	                            
+
+ 
 			<div class="clr-checkbox-wrapper">           
 				<input type="checkbox" id="apfc_panel_monitoring" formControlName="apfc_panel_monitoring"  class="clr-checkbox" />       
 				    <label for="apfc_panel_monitoring" class="clr-control-label">apfc panel monitoring</label>  </div>
@@ -884,12 +890,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>

orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.ts

@@ -86,7 +86,7 @@ deployment_type : [null],
 
   
  
-lt_panel_monitoring:[false],
+apfc_panel_monitoring:[false],
    
 
  
@@ -106,11 +106,11 @@ ups_monitoring:[false],
    
 
  
-apfc_panel_monitoring:[false],
+busbar_monitoring:[false],
    
 
  
-busbar_monitoring:[false],
+lt_panel_monitoring:[false],
    
 
  
@@ -118,11 +118,11 @@ ht_panel_monitoring:[false],
    
 
  
-compressed_air__gag_monitoring:[false],
+water_management_stp_etp:[false],
    
 
  
-water_management_stp_etp:[false],
+compressed_air__gag_monitoring:[false],
    
 
  

orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts

@@ -8,6 +8,11 @@
 
 
 
+
+
+
+
+
 import { TypesComponent } from './BuilderComponents/basicp1/Types/Types.component';
 import { ProductComponent } from './BuilderComponents/basicp1/Product/Product.component';
 import { ManufacturerComponent } from './BuilderComponents/basicp1/Manufacturer/Manufacturer.component';
@@ -281,6 +286,16 @@ const routes: Routes = [
 
 
 
+
+
+
+
+
+
+
+
+
+
 
 
 

orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts

@@ -8,6 +8,11 @@
 
 
 
+
+
+
+
+
 import { TypesComponent } from './BuilderComponents/basicp1/Types/Types.component';
 import { ProductComponent } from './BuilderComponents/basicp1/Product/Product.component';
 import { ManufacturerComponent } from './BuilderComponents/basicp1/Manufacturer/Manufacturer.component';
@@ -154,6 +159,16 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S
 
 
 
+
+
+
+
+
+
+
+
+
+