From 416040370b5d725c2332c42c146399265ac891a1 Mon Sep 17 00:00:00 2001 From: risadmin_prod Date: Thu, 12 Jun 2025 16:52:53 +0000 Subject: [PATCH] build_app --- .../Builders/Services/BuilderService.java | 24 ++++++ .../Entity/Customer_information.java | 12 +-- .../Services/Customer_informationService.java | 12 +-- .../Services/Product_selectionService.java | 4 +- .../Customer_information.component.html | 74 +++++++++---------- .../Customer_information.component.ts | 8 +- .../app/modules/main/main-routing.module.ts | 24 ++++++ .../src/app/modules/main/main.module.ts | 24 ++++++ 8 files changed, 127 insertions(+), 55 deletions(-) diff --git a/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java b/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java index 29e15c1..66e7236 100644 --- a/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java +++ b/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java @@ -90,6 +90,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"); diff --git a/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Entity/Customer_information.java b/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Entity/Customer_information.java index 90d4dc8..f263773 100644 --- a/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Entity/Customer_information.java +++ b/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_without_fuel; +private boolean dg_monitoring_with_fuel; @@ -57,7 +57,7 @@ private boolean active_energy; -private boolean dg_monitoring_with_fuel; +private boolean dg_monitoring_without_fuel; @@ -77,6 +77,10 @@ private boolean lt_panel_monitoring; +private boolean water_management_stp_etp; + + + private boolean ht_panel_monitoring; @@ -92,10 +96,6 @@ private boolean compressed_air_lpg_o2_n2_co2; private boolean water_management_water_monitoring; - -private boolean water_management_stp_etp; - - diff --git a/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Customer_informationService.java b/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Customer_informationService.java index 66ce0fa..052abdb 100644 --- a/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Customer_informationService.java +++ b/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Customer_informationService.java @@ -118,6 +118,10 @@ old.setDeployment_type(data.getDeployment_type()); +old.setUps_monitoring(data.isUps_monitoring()); + + + old.setActive_energy(data.isActive_energy()); @@ -130,19 +134,15 @@ 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.setWater_management_stp_etp(data.isWater_management_stp_etp()); +old.setBusbar_monitoring(data.isBusbar_monitoring()); -old.setBusbar_monitoring(data.isBusbar_monitoring()); +old.setWater_management_stp_etp(data.isWater_management_stp_etp()); diff --git a/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Product_selectionService.java b/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Product_selectionService.java index 2843dce..ed5bde4 100644 --- a/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Product_selectionService.java +++ b/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Product_selectionService.java @@ -71,7 +71,7 @@ public Product_selection Savedata(Product_selection data) { if (data.getManufacturer() != null) { Manufacturer get = manufacturerserv.getdetailsbyId(data.getManufacturer()); - data.setManufacturername(get.getManufacturer_Name()); + data.setManufacturername(get.getManufacturer_name()); } @@ -93,7 +93,7 @@ if (data.getType() != null) { if (data.getProduct() != null) { Productss get = productserv.getdetailsbyId(data.getProduct()); - data.setProductname(get.getProduct_Name()); + data.setProductname(get.getProduct_name()); } diff --git a/orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/order_estimation/Customer_information/Customer_information.component.html b/orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/order_estimation/Customer_information/Customer_information.component.html index c02634b..8974f8a 100644 --- a/orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/order_estimation/Customer_information/Customer_information.component.html +++ b/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 @@ - dg_monitoring_with_fuel + lt_panel_monitoring @@ -65,6 +65,11 @@ + dg_monitoring_with_fuel + + + + dg_monitoring_without_fuel @@ -85,12 +90,12 @@ - lt_panel_monitoring + ht_panel_monitoring - ht_panel_monitoring + water_management_stp_etp @@ -105,11 +110,6 @@ - water_management_stp_etp - - - - water_management_water_monitoring @@ -147,7 +147,7 @@ -{{user. dg_monitoring_without_fuel}} +{{user. dg_monitoring_with_fuel}} @@ -155,7 +155,7 @@ -{{user. dg_monitoring_with_fuel}} +{{user. dg_monitoring_without_fuel}} @@ -179,11 +179,11 @@ -{{user. water_management_stp_etp}} +{{user. compressed_air__gas_monitoring}} -{{user. compressed_air__gas_monitoring}} +{{user. water_management_stp_etp}} @@ -453,8 +453,8 @@ -
-
+
+
@@ -467,6 +467,13 @@ +
+
+ + + + +
@@ -481,15 +488,15 @@ -
-
+
+
-
-
+
+
@@ -528,13 +535,6 @@ - - -
-
- - - @@ -686,6 +686,12 @@ +
+ +
+ + +
@@ -698,18 +704,6 @@ -
- -
- - - -
- -
- - -
@@ -752,6 +746,12 @@ +
+ +
+ + +
diff --git a/orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/order_estimation/Customer_information/Customer_information.component.ts b/orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/order_estimation/Customer_information/Customer_information.component.ts index 68345b9..4ca643e 100644 --- a/orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/order_estimation/Customer_information/Customer_information.component.ts +++ b/orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/order_estimation/Customer_information/Customer_information.component.ts @@ -96,10 +96,6 @@ dg_monitoring_without_fuel:[false], -water_management_stp_etp:[false], - - - ups_monitoring:[false], @@ -120,6 +116,10 @@ compressed_air__gas_monitoring:[false], +water_management_stp_etp:[false], + + + compressed_air_lpg_o2_n2_co2:[false], diff --git a/orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts index dd8e906..1931852 100644 --- a/orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts +++ b/orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts @@ -1,3 +1,11 @@ + + + + + + + + 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'; @@ -265,6 +273,22 @@ const routes: Routes = [ // buildercomponents + + + + + + + + + + + + + + + + {path:'Generate_quote',component:Generate_quoteComponent}, diff --git a/orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts index 3b3540e..82664dd 100644 --- a/orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts +++ b/orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts @@ -1,3 +1,11 @@ + + + + + + + + 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'; @@ -137,6 +145,22 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S // buildercomponents + + + + + + + + + + + + + + + + Generate_quoteComponent,