build_app

orderestimatetest-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java

@@ -78,6 +78,18 @@ addCustomMenu( "Productss","Productss",  "Transcations");
 addCustomMenu( "Type","Type",  "Transcations"); 
 
 
+addCustomMenu( "Customer_information","Customer_information",  "Transcations"); 
+
+
+addCustomMenu( "Manufacturer","Manufacturer",  "Transcations"); 
+
+
+addCustomMenu( "Productss","Productss",  "Transcations"); 
+
+
+addCustomMenu( "Type","Type",  "Transcations"); 
+
+
 addCustomMenu( "Customer_information","Customer_information",  "Transcations"); 
 
 

orderestimatetest-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Entity/Customer_information.java

@@ -73,6 +73,10 @@ private String deployment_type;
 
   
  
+private boolean apfc_panel_monitoring;
+   
+
+ 
 private boolean active_energy;
    
 
@@ -89,18 +93,10 @@ private boolean ups_monitoring;
    
 
  
-private boolean apfc_panel_monitoring;
-   
-
- 
 private boolean busbar_monitoring;
    
 
  
-private boolean water_management_stp_etp;
-   
-
- 
 private boolean lt_panel_monitoring;
    
 
@@ -113,6 +109,10 @@ private boolean compressed_air__gas_monitoring;
    
 
  
+private boolean water_management_stp_etp;
+   
+
+ 
 private boolean compressed_air_lpg_o2_n2_co2;
    
 

orderestimatetest-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Customer_informationService.java

@@ -262,14 +262,14 @@ old.setCompressed_air__gas_monitoring(data.isCompressed_air__gas_monitoring());
    
 
  
-old.setCompressed_air_lpg_o2_n2_co2(data.isCompressed_air_lpg_o2_n2_co2());
-   
-
- 
 old.setWater_management_stp_etp(data.isWater_management_stp_etp());
    
 
  
+old.setCompressed_air_lpg_o2_n2_co2(data.isCompressed_air_lpg_o2_n2_co2());
+   
+
+ 
 old.setWater_management_water_monitoring(data.isWater_management_water_monitoring());
    
 

orderestimatetest-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/order_estimation/Customer_information/Customer_information.component.html

@@ -49,7 +49,7 @@
  
  
  
-<clr-dg-column [clrDgField]="' lt_panel_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> lt_panel_monitoring
+<clr-dg-column [clrDgField]="' ht_panel_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> ht_panel_monitoring
 						    </ng-container></clr-dg-column>
    
 
@@ -84,7 +84,7 @@
    
 
  
-<clr-dg-column [clrDgField]="' ht_panel_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> ht_panel_monitoring
+<clr-dg-column [clrDgField]="' lt_panel_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> lt_panel_monitoring
 						    </ng-container></clr-dg-column>
    
 
@@ -189,7 +189,7 @@
 
 
  
-<clr-dg-cell>{{user. lt_panel_monitoring}}</clr-dg-cell>
+<clr-dg-cell>{{user. ht_panel_monitoring}}</clr-dg-cell>
    
 
  
@@ -217,11 +217,7 @@
    
 
  
-<clr-dg-cell>{{user. ht_panel_monitoring}}</clr-dg-cell>
+<clr-dg-cell>{{user. lt_panel_monitoring}}</clr-dg-cell>
-   
-
- 
-<clr-dg-cell>{{user. water_management_stp_etp}}</clr-dg-cell>
    
 
  
@@ -233,6 +229,10 @@
    
 
  
+<clr-dg-cell>{{user. water_management_stp_etp}}</clr-dg-cell>
+   
+
+ 
 <clr-dg-cell>{{user. water_management_water_monitoring}}</clr-dg-cell>
    
 
@@ -584,6 +584,13 @@
       
  
 
+      <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>
+
+       
+
+ 
+
       <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>
 
@@ -598,13 +605,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="dg_monitoring_without_fuel" name="dg_monitoring_without_fuel" [(ngModel)]="rowSelected.dg_monitoring_without_fuel" class="clr-checkbox" /> 
 <label for="dg_monitoring_without_fuel" class="clr-control-label"> dg_monitoring_without_fuel</label> </div>
 
@@ -612,13 +612,6 @@
 
  
 
-      <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>
-
-       
-
- 
-
       <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>
 
@@ -654,6 +647,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="compressed_air_lpg_o2_n2_co2" name="compressed_air_lpg_o2_n2_co2" [(ngModel)]="rowSelected.compressed_air_lpg_o2_n2_co2" class="clr-checkbox" /> 
 <label for="compressed_air_lpg_o2_n2_co2" class="clr-control-label"> compressed_air_lpg_o2_n2_co2</label> </div>
 
@@ -987,8 +987,8 @@
                        
  
 			<div class="clr-checkbox-wrapper">           
-				<input type="checkbox" id="dg_monitoring_without_fuel" formControlName="dg_monitoring_without_fuel"  class="clr-checkbox" />       
+				<input type="checkbox" id="ups_monitoring" formControlName="ups_monitoring"  class="clr-checkbox" />       
-				    <label for="dg_monitoring_without_fuel" class="clr-control-label">dg_monitoring_without_fuel</label>  </div>
+				    <label for="ups_monitoring" class="clr-control-label">ups_monitoring</label>  </div>
 	                            
 
  
@@ -1005,8 +1005,8 @@
 
  
 			<div class="clr-checkbox-wrapper">           
-				<input type="checkbox" id="ups_monitoring" formControlName="ups_monitoring"  class="clr-checkbox" />       
+				<input type="checkbox" id="dg_monitoring_without_fuel" formControlName="dg_monitoring_without_fuel"  class="clr-checkbox" />       
-				    <label for="ups_monitoring" class="clr-control-label">ups_monitoring</label>  </div>
+				    <label for="dg_monitoring_without_fuel" class="clr-control-label">dg_monitoring_without_fuel</label>  </div>
 	                            
 
  
@@ -1034,12 +1034,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="compressed_air__gas_monitoring" formControlName="compressed_air__gas_monitoring"  class="clr-checkbox" />       
 				    <label for="compressed_air__gas_monitoring" class="clr-control-label">compressed_air__gas_monitoring</label>  </div>
@@ -1052,6 +1046,12 @@
 	                            
 
  
+			<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="water_management_water_monitoring" formControlName="water_management_water_monitoring"  class="clr-checkbox" />       
 				    <label for="water_management_water_monitoring" class="clr-control-label">water_management_water_monitoring</label>  </div>

orderestimatetest-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/order_estimation/Customer_information/Customer_information.component.ts

@@ -77,7 +77,7 @@ deployment_type : [null],
 
   
  
-apfc_panel_monitoring:[false],
+dg_monitoring_without_fuel:[false],
    
 
  
@@ -89,14 +89,18 @@ dg_monitoring_with_fuel:[false],
    
 
  
-dg_monitoring_without_fuel:[false],
-   
-
- 
 ups_monitoring:[false],
    
 
  
+apfc_panel_monitoring:[false],
+   
+
+ 
+water_management_stp_etp:[false],
+   
+
+ 
 busbar_monitoring:[false],
    
 
@@ -109,10 +113,6 @@ ht_panel_monitoring:[false],
    
 
  
-water_management_stp_etp:[false],
-   
-
- 
 compressed_air__gas_monitoring:[false],
    
 

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

@@ -1,3 +1,7 @@
+
+
+
+
 import { ManufacturerComponent } from './BuilderComponents/order_estimation/Manufacturer/Manufacturer.component';
 import { ProductssComponent } from './BuilderComponents/order_estimation/Productss/Productss.component';
 import { TypeComponent } from './BuilderComponents/order_estimation/Type/Type.component';
@@ -261,6 +265,14 @@ const routes: Routes = [
 
 
       // buildercomponents
+
+
+
+
+
+
+
+
 {path:'Manufacturer',component:ManufacturerComponent},
 
 

orderestimatetest-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts

@@ -1,3 +1,7 @@
+
+
+
+
 import { ManufacturerComponent } from './BuilderComponents/order_estimation/Manufacturer/Manufacturer.component';
 import { ProductssComponent } from './BuilderComponents/order_estimation/Productss/Productss.component';
 import { TypeComponent } from './BuilderComponents/order_estimation/Type/Type.component';
@@ -133,6 +137,14 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S
 
 
     // buildercomponents
+
+
+
+
+
+
+
+
 ManufacturerComponent,