build_app

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

@@ -114,6 +114,30 @@ addCustomMenu( "Type","Type",  "Transcations");
 addCustomMenu( "Product_selection","Product_selection",  "Transcations"); 
 
 
+addCustomMenu( "Customer_information","Customer_information",  "Transcations"); 
+
+
+addCustomMenu( "Generate_quote","Generate_quote",  "Transcations"); 
+
+
+addCustomMenu( "Notes_and_terms","Notes_and_terms",  "Transcations"); 
+
+
+addCustomMenu( "Order_summary","Order_summary",  "Transcations"); 
+
+
+addCustomMenu( "Manufacturer","Manufacturer",  "Transcations"); 
+
+
+addCustomMenu( "Productss","Productss",  "Transcations"); 
+
+
+addCustomMenu( "Type","Type",  "Transcations"); 
+
+
+addCustomMenu( "Product_selection","Product_selection",  "Transcations"); 
+
+
 addCustomMenu( "Customer_information","Customer_information",  "Transcations"); 
 
 

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

@@ -49,7 +49,7 @@ private String deployment_type;
 
   
  
-private boolean dg_monitoring_with_fuel;
+private boolean compressed_air__gas_monitoring;
    
 
  
@@ -57,6 +57,10 @@ private boolean active_energy;
    
 
  
+private boolean dg_monitoring_with_fuel;
+   
+
+ 
 private boolean dg_monitoring_without_fuel;
    
 
@@ -73,22 +77,18 @@ private boolean busbar_monitoring;
    
 
  
-private boolean lt_panel_monitoring;
-   
-
- 
 private boolean water_management_stp_etp;
    
 
  
+private boolean lt_panel_monitoring;
+   
+
+ 
 private boolean ht_panel_monitoring;
    
 
  
-private boolean compressed_air__gas_monitoring;
-   
-
- 
 private boolean compressed_air_lpg_o2_n2_co2;
    
 

orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Customer_informationInsertService1.java

@@ -21,14 +21,6 @@ public Customer_information insertaction(Customer_information customer_informati
 	customer_information.setUpdatedBy(getUser().getUserId());
 		customer_information.setCreatedBy(getUser().getUserId());
 		customer_information.setAccountId(getUser().getAccount().getAccount_id()); 
-	customer_information.setCustomer_name("text");
-customer_information.setEmail_address("email");
-customer_information.setContact_person("text");
-customer_information.setPhone_number("phone");
-customer_information.setSelect_objective("checkbox");
-customer_information.setReset_btn("text");
-customer_information.setCustomer_address("Paragraph");
-customer_information.setDeployment_type("select");
 	final Customer_information save = Repository.save(customer_information);
 		return save;
 } 

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

@@ -118,7 +118,7 @@ old.setDeployment_type(data.getDeployment_type());
 
   
  
-old.setUps_monitoring(data.isUps_monitoring());
+old.setBusbar_monitoring(data.isBusbar_monitoring());
    
 
  
@@ -134,18 +134,14 @@ old.setDg_monitoring_without_fuel(data.isDg_monitoring_without_fuel());
    
 
  
+old.setUps_monitoring(data.isUps_monitoring());
+   
+
+ 
 old.setApfc_panel_monitoring(data.isApfc_panel_monitoring());
    
 
  
-old.setBusbar_monitoring(data.isBusbar_monitoring());
-   
-
- 
-old.setWater_management_stp_etp(data.isWater_management_stp_etp());
-   
-
- 
 old.setLt_panel_monitoring(data.isLt_panel_monitoring());
    
 
@@ -166,6 +162,10 @@ old.setWater_management_water_monitoring(data.isWater_management_water_monitorin
    
 
  
+old.setWater_management_stp_etp(data.isWater_management_stp_etp());
+   
+
+
   
 
 

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

@@ -55,7 +55,7 @@
  
  
  
-<clr-dg-column [clrDgField]="' lt_panel_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> lt_panel_monitoring
+<clr-dg-column [clrDgField]="' dg_monitoring_with_fuel'"> <ng-container *clrDgHideableColumn="{hidden: false}"> dg_monitoring_with_fuel
 						    </ng-container></clr-dg-column>
    
 
@@ -65,11 +65,6 @@
    
 
  
-<clr-dg-column [clrDgField]="' dg_monitoring_with_fuel'"> <ng-container *clrDgHideableColumn="{hidden: false}"> dg_monitoring_with_fuel
-						    </ng-container></clr-dg-column>
-   
-
- 
 <clr-dg-column [clrDgField]="' dg_monitoring_without_fuel'"> <ng-container *clrDgHideableColumn="{hidden: false}"> dg_monitoring_without_fuel
 						    </ng-container></clr-dg-column>
    
@@ -90,7 +85,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>
    
 
@@ -100,6 +95,11 @@
    
 
  
+<clr-dg-column [clrDgField]="' ht_panel_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> ht_panel_monitoring
+						    </ng-container></clr-dg-column>
+   
+
+ 
 <clr-dg-column [clrDgField]="' compressed_air__gas_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> compressed_air__gas_monitoring
 						    </ng-container></clr-dg-column>
    
@@ -147,7 +147,7 @@
 
 
  
-<clr-dg-cell>{{user. dg_monitoring_with_fuel}}</clr-dg-cell>
+<clr-dg-cell>{{user. busbar_monitoring}}</clr-dg-cell>
    
 
  
@@ -155,6 +155,14 @@
    
 
  
+<clr-dg-cell>{{user. water_management_stp_etp}}</clr-dg-cell>
+   
+
+ 
+<clr-dg-cell>{{user. dg_monitoring_with_fuel}}</clr-dg-cell>
+   
+
+ 
 <clr-dg-cell>{{user. dg_monitoring_without_fuel}}</clr-dg-cell>
    
 
@@ -167,10 +175,6 @@
    
 
  
-<clr-dg-cell>{{user. busbar_monitoring}}</clr-dg-cell>
-   
-
- 
 <clr-dg-cell>{{user. lt_panel_monitoring}}</clr-dg-cell>
    
 
@@ -183,10 +187,6 @@
    
 
  
-<clr-dg-cell>{{user. water_management_stp_etp}}</clr-dg-cell>
-   
-
- 
 <clr-dg-cell>{{user. compressed_air_lpg_o2_n2_co2}}</clr-dg-cell>
    
 
@@ -467,13 +467,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_with_fuel" name="dg_monitoring_with_fuel" [(ngModel)]="rowSelected.dg_monitoring_with_fuel" class="clr-checkbox" /> 
 <label for="dg_monitoring_with_fuel" class="clr-control-label"> dg_monitoring_with_fuel</label> </div>
 
@@ -536,6 +529,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>
 </div>
@@ -722,6 +722,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="lt_panel_monitoring" formControlName="lt_panel_monitoring"  class="clr-checkbox" />       
 				    <label for="lt_panel_monitoring" class="clr-control-label">lt_panel_monitoring</label>  </div>
@@ -746,12 +752,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="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>
@@ -837,35 +837,35 @@
         <div class="clr-row">
           <div class="clr-col-md-4 clr-col-sm-12">
             <label for="customer_name">Customer_Name:</label>
-            <input type="text" id="customer_name" formControlName="customer_name" name="customer_name" readonly class="clr-input">
+            <input type="text" id="customer_name" formControlName="customer_name" name="customer_name" placeholder="Enter Customer_Name" class="clr-input">
           </div>
           <div class="clr-col-md-4 clr-col-sm-12">
             <label for="email_address">Email_Address:</label>
-            <input type="text" id="email_address" formControlName="email_address" name="email_address" readonly class="clr-input">
+            <input type="text" id="email_address" formControlName="email_address" name="email_address" placeholder="Enter Email_Address" class="clr-input">
           </div>
           <div class="clr-col-md-4 clr-col-sm-12">
             <label for="contact_person">Contact_Person:</label>
-            <input type="text" id="contact_person" formControlName="contact_person" name="contact_person" readonly class="clr-input">
+            <input type="text" id="contact_person" formControlName="contact_person" name="contact_person" placeholder="Enter Contact_Person" class="clr-input">
           </div>
           <div class="clr-col-md-4 clr-col-sm-12">
             <label for="phone_number">Phone_Number:</label>
-            <input type="text" id="phone_number" formControlName="phone_number" name="phone_number" readonly class="clr-input">
+            <input type="text" id="phone_number" formControlName="phone_number" name="phone_number" placeholder="Enter Phone_Number" class="clr-input">
           </div>
           <div class="clr-col-md-4 clr-col-sm-12">
             <label for="select_objective">Select_Objective:</label>
-            <input type="text" id="select_objective" formControlName="select_objective" name="select_objective" readonly class="clr-input">
+            <input type="text" id="select_objective" formControlName="select_objective" name="select_objective" placeholder="Enter Select_Objective" class="clr-input">
           </div>
           <div class="clr-col-md-4 clr-col-sm-12">
             <label for="reset_btn">Reset_btn:</label>
-            <input type="text" id="reset_btn" formControlName="reset_btn" name="reset_btn" readonly class="clr-input">
+            <input type="text" id="reset_btn" formControlName="reset_btn" name="reset_btn" placeholder="Enter Reset_btn" class="clr-input">
           </div>
           <div class="clr-col-md-4 clr-col-sm-12">
             <label for="customer_address">Customer_Address:</label>
-            <input type="text" id="customer_address" formControlName="customer_address" name="customer_address" readonly class="clr-input">
+            <input type="text" id="customer_address" formControlName="customer_address" name="customer_address" placeholder="Enter Customer_Address" class="clr-input">
           </div>
           <div class="clr-col-md-4 clr-col-sm-12">
             <label for="deployment_type">Deployment_Type:</label>
-            <input type="text" id="deployment_type" formControlName="deployment_type" name="deployment_type" readonly class="clr-input">
+            <input type="text" id="deployment_type" formControlName="deployment_type" name="deployment_type" placeholder="Enter Deployment_Type" class="clr-input">
           </div>
         </div>
         <br>

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

@@ -80,10 +80,6 @@ deployment_type : [null],
 
   
  
-apfc_panel_monitoring:[false],
-   
-
- 
 active_energy:[false],
    
 
@@ -100,6 +96,10 @@ ups_monitoring:[false],
    
 
  
+apfc_panel_monitoring:[false],
+   
+
+ 
 busbar_monitoring:[false],
    
 
@@ -112,14 +112,14 @@ ht_panel_monitoring:[false],
    
 
  
-compressed_air__gas_monitoring:[false],
-   
-
- 
 water_management_stp_etp:[false],
    
 
  
+compressed_air__gas_monitoring:[false],
+   
+
+ 
 compressed_air_lpg_o2_n2_co2:[false],
    
 
@@ -150,14 +150,14 @@ water_management_water_monitoring:[false],
   }); // component_button200
 // inser code start
   this.insertFormReset_btn = this._fb.group({
-    customer_name: 'text',
+    customer_name: '',
-    email_address: 'email',
+    email_address: '',
-    contact_person: 'text',
+    contact_person: '',
-    phone_number: 'phone',
+    phone_number: '',
-    select_objective: 'checkbox',
+    select_objective: '',
-    reset_btn: 'text',
+    reset_btn: '',
-    customer_address: 'Paragraph',
+    customer_address: '',
-    deployment_type: 'select',
+    deployment_type: '',
   });
 
   // insert code end

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

@@ -6,6 +6,14 @@
 
 
 
+
+
+
+
+
+
+
+
 import { Generate_quoteComponent } from './BuilderComponents/order_estimation/Generate_quote/Generate_quote.component';
 import { Notes_and_termsComponent } from './BuilderComponents/order_estimation/Notes_and_terms/Notes_and_terms.component';
 import { Order_summaryComponent } from './BuilderComponents/order_estimation/Order_summary/Order_summary.component';
@@ -284,6 +292,22 @@ const routes: Routes = [
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

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

@@ -6,6 +6,14 @@
 
 
 
+
+
+
+
+
+
+
+
 import { Generate_quoteComponent } from './BuilderComponents/order_estimation/Generate_quote/Generate_quote.component';
 import { Notes_and_termsComponent } from './BuilderComponents/order_estimation/Notes_and_terms/Notes_and_terms.component';
 import { Order_summaryComponent } from './BuilderComponents/order_estimation/Order_summary/Order_summary.component';
@@ -156,6 +164,22 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+