From 8eff629203662b966ef7a6506577951a48e75113 Mon Sep 17 00:00:00 2001 From: risadmin_prod Date: Fri, 25 Jul 2025 09:55:15 +0000 Subject: [PATCH] build_app --- .../Builders/Services/BuilderService.java | 15 ++++ .../basicp1/Entity/Customer_information.java | 24 +++--- .../Services/Customer_informationService.java | 24 +++--- .../Customer_information.component.html | 80 +++++++++---------- .../Customer_information.component.ts | 10 +-- .../app/modules/main/main-routing.module.ts | 15 ++++ .../src/app/modules/main/main.module.ts | 15 ++++ 7 files changed, 114 insertions(+), 69 deletions(-) diff --git a/orderestimation0010-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java b/orderestimation0010-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java index 21b94e7..c6f0862 100644 --- a/orderestimation0010-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java +++ b/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"); diff --git a/orderestimation0010-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Customer_information.java b/orderestimation0010-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Customer_information.java index bfed20c..9fa4625 100644 --- a/orderestimation0010-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Customer_information.java +++ b/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; diff --git a/orderestimation0010-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Customer_informationService.java b/orderestimation0010-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Customer_informationService.java index c3f37df..83d3d1d 100644 --- a/orderestimation0010-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Customer_informationService.java +++ b/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()); diff --git a/orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.html b/orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.html index 56840b7..9b55a6e 100644 --- a/orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.html +++ b/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 @@ - busbar monitoring + dg monitoring - with fule @@ -71,11 +71,6 @@ - dg monitoring - with fule - - - - dg monitoring - without fule @@ -86,12 +81,17 @@ - water management-stp/etp + apfc panel monitoring - apfc panel monitoring + busbar monitoring + + + + + water management-stp/etp @@ -171,10 +171,6 @@ -{{user.ups_monitoring}} - - - {{user.active_energy}} @@ -187,6 +183,10 @@ +{{user.ups_monitoring}} + + + {{user.apfc_panel_monitoring}} @@ -195,6 +195,10 @@ +{{user.water_management_stp_etp}} + + + {{user.lt_panel_monitoring}} @@ -214,10 +218,6 @@ {{user.water_management_water_monitoring}} - -{{user.water_management_stp_etp}} - - @@ -538,6 +538,13 @@ +
+
+ + + + +
@@ -580,13 +587,6 @@ -
-
- - - - -
@@ -594,13 +594,6 @@ -
-
- - - - -
@@ -620,6 +613,13 @@ + + +
+
+ + + @@ -843,8 +843,8 @@
- -
+ + @@ -855,8 +855,8 @@
- -
+ + @@ -866,6 +866,12 @@ +
+ +
+ + +
@@ -884,12 +890,6 @@ -
- -
- - -
diff --git a/orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.ts b/orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.ts index 3ccce63..a8c7231 100644 --- a/orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.ts +++ b/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], diff --git a/orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts index f07014c..e78fb7c 100644 --- a/orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts +++ b/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 = [ + + + + + + + + + + diff --git a/orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts index 57f4e83..06fd098 100644 --- a/orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts +++ b/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 + + + + + + + + + +