diff --git a/orderestimatetest-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java b/orderestimatetest-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java index 46d138a..c9edc83 100644 --- a/orderestimatetest-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java +++ b/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"); diff --git a/orderestimatetest-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Entity/Customer_information.java b/orderestimatetest-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Entity/Customer_information.java index 077d93e..b21d4e8 100644 --- a/orderestimatetest-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Entity/Customer_information.java +++ b/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; diff --git a/orderestimatetest-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Customer_informationService.java b/orderestimatetest-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Customer_informationService.java index c156db0..f4381e4 100644 --- a/orderestimatetest-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Customer_informationService.java +++ b/orderestimatetest-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Customer_informationService.java @@ -262,11 +262,11 @@ 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.setWater_management_stp_etp(data.isWater_management_stp_etp()); +old.setCompressed_air_lpg_o2_n2_co2(data.isCompressed_air_lpg_o2_n2_co2()); diff --git a/orderestimatetest-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/order_estimation/Customer_information/Customer_information.component.html b/orderestimatetest-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/order_estimation/Customer_information/Customer_information.component.html index 79645af..96f631e 100644 --- a/orderestimatetest-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/order_estimation/Customer_information/Customer_information.component.html +++ b/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 @@ - lt_panel_monitoring + ht_panel_monitoring @@ -84,7 +84,7 @@ - ht_panel_monitoring + lt_panel_monitoring @@ -189,7 +189,7 @@ -{{user. lt_panel_monitoring}} +{{user. ht_panel_monitoring}} @@ -217,11 +217,7 @@ -{{user. ht_panel_monitoring}} - - - -{{user. water_management_stp_etp}} +{{user. lt_panel_monitoring}} @@ -233,6 +229,10 @@ +{{user. water_management_stp_etp}} + + + {{user. water_management_water_monitoring}} @@ -584,6 +584,13 @@ +
+
+ + + + +
@@ -598,13 +605,6 @@ -
-
- - - - -
@@ -612,13 +612,6 @@ -
-
- - - - -
@@ -654,6 +647,13 @@ +
+
+ + + + +
@@ -987,8 +987,8 @@
- -
+ + @@ -1005,8 +1005,8 @@
- -
+ + @@ -1034,12 +1034,6 @@ -
- -
- - -
@@ -1052,6 +1046,12 @@ +
+ +
+ + +
diff --git a/orderestimatetest-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/order_estimation/Customer_information/Customer_information.component.ts b/orderestimatetest-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/order_estimation/Customer_information/Customer_information.component.ts index 68edc76..f746674 100644 --- a/orderestimatetest-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/order_estimation/Customer_information/Customer_information.component.ts +++ b/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,11 +89,15 @@ dg_monitoring_with_fuel:[false], -dg_monitoring_without_fuel:[false], +ups_monitoring:[false], -ups_monitoring:[false], +apfc_panel_monitoring:[false], + + + +water_management_stp_etp:[false], @@ -109,10 +113,6 @@ ht_panel_monitoring:[false], -water_management_stp_etp:[false], - - - compressed_air__gas_monitoring:[false], diff --git a/orderestimatetest-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/orderestimatetest-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts index 0db8530..9f45ae0 100644 --- a/orderestimatetest-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts +++ b/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}, diff --git a/orderestimatetest-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/orderestimatetest-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts index 7ed6187..c9cb663 100644 --- a/orderestimatetest-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts +++ b/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,