From aedfc06a60cf10c68e59f7f1b440ec374b9e05ad Mon Sep 17 00:00:00 2001 From: risadmin_prod Date: Wed, 23 Jul 2025 12:49:33 +0000 Subject: [PATCH] build_app --- .../Builders/Services/BuilderService.java | 15 +++++ .../basicp1/Entity/Customer_information.java | 26 ++++---- .../Services/Customer_informationService.java | 28 ++++---- .../Customer_information.component.html | 66 +++++++++---------- .../Customer_information.component.ts | 10 +-- .../Customer_information.service.ts | 8 +-- .../app/modules/main/main-routing.module.ts | 15 +++++ .../src/app/modules/main/main.module.ts | 15 +++++ 8 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 a7639b3..21b94e7 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 @@ -96,6 +96,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 f7c00ab..bfed20c 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,11 +76,7 @@ private String deployment_typename; -private boolean apfc_panel_monitoring; - - - -private boolean dg_monitoring___without_fule; +private boolean compressed_air___lpg_n2_o2_co2; @@ -92,10 +88,22 @@ private boolean dg_monitoring___with_fule; +private boolean dg_monitoring___without_fule; + + + +private boolean water_management_stp_etp; + + + private boolean ups_monitoring; +private boolean apfc_panel_monitoring; + + + private boolean busbar_monitoring; @@ -112,14 +120,6 @@ private boolean compressed_air__gag_monitoring; -private boolean compressed_air___lpg_n2_o2_co2; - - - -private boolean water_management_stp_etp; - - - 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 1c1e9c6..c3f37df 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 @@ -16,8 +16,8 @@ import com.realnet.users.entity1.AppUser; -import com.realnet.basicp1.Entity.Manufacturer; -import com.realnet.basicp1.Services.ManufacturerService; +import com.realnet.basicp1.Entity.; +import com.realnet.basicp1.Services.Service; @@ -31,8 +31,8 @@ import com.realnet.basicp1.Services.ManufacturerService; -import com.realnet.basicp1.Entity.Deployment_type; -import com.realnet.basicp1.Services.Deployment_typeService; +import com.realnet.basicp1.Entity.; +import com.realnet.basicp1.Services.Service; @@ -58,7 +58,7 @@ private Customer_informationRepository Repository; @Autowired - private ManufacturerService manufacturerserv; + private Service manufacturerserv; @@ -71,7 +71,7 @@ private Customer_informationRepository Repository; @Autowired - private Deployment_typeService deployment_typeserv; + private Service deployment_typeserv; @@ -91,7 +91,7 @@ public Customer_information Savedata(Customer_information data) { if (data.getManufacturer() != null) { try { int manufacturerId = Integer.valueOf(data.getManufacturer()); -Manufacturer get = manufacturerserv.getdetailsbyId(manufacturerId); + get = manufacturerserv.getdetailsbyId(manufacturerId); if (get != null) { data.setManufacturername(get.getManufacturer_name()); @@ -121,7 +121,7 @@ Manufacturer get = manufacturerserv.getdetailsbyId(manufacturerId); if (data.getDeployment_type() != null) { try { int deployment_typeId = Integer.valueOf(data.getDeployment_type()); -Deployment_type get = deployment_typeserv.getdetailsbyId(deployment_typeId); + get = deployment_typeserv.getdetailsbyId(deployment_typeId); if (get != null) { data.setDeployment_typename(get.getDeployment_type()); @@ -201,10 +201,6 @@ old.setDeployment_type(data.getDeployment_type()); -old.setBusbar_monitoring(data.isBusbar_monitoring()); - - - old.setActive_energy(data.isActive_energy()); @@ -225,11 +221,11 @@ old.setApfc_panel_monitoring(data.isApfc_panel_monitoring()); -old.setLt_panel_monitoring(data.isLt_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()); @@ -245,6 +241,10 @@ old.setCompressed_air___lpg_n2_o2_co2(data.isCompressed_air___lpg_n2_o2_co2()); +old.setWater_management_stp_etp(data.isWater_management_stp_etp()); + + + old.setWater_management_water_monitoring(data.isWater_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 219a996..56840b7 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 @@ - compressed air -gag monitoring + busbar monitoring @@ -86,12 +86,12 @@ - apfc panel monitoring + water management-stp/etp - busbar monitoring + apfc panel monitoring @@ -106,7 +106,7 @@ - water management-stp/etp + compressed air -gag monitoring @@ -171,6 +171,10 @@ +{{user.ups_monitoring}} + + + {{user.active_energy}} @@ -183,10 +187,6 @@ -{{user.ups_monitoring}} - - - {{user.apfc_panel_monitoring}} @@ -538,13 +538,6 @@ -
-
- - - - -
@@ -552,15 +545,15 @@ -
-
+
+
-
-
+
+
@@ -601,6 +594,13 @@ +
+
+ + + + +
@@ -843,8 +843,8 @@
- -
+ + @@ -854,12 +854,6 @@ -
- -
- - -
@@ -872,12 +866,6 @@ -
- -
- - -
@@ -896,6 +884,18 @@ +
+ +
+ + + +
+ +
+ + +
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 cd3d331..3ccce63 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,6 +86,10 @@ deployment_type : [null], +lt_panel_monitoring:[false], + + + active_energy:[false], @@ -110,10 +114,6 @@ busbar_monitoring:[false], -lt_panel_monitoring:[false], - - - ht_panel_monitoring:[false], @@ -631,7 +631,7 @@ console.log(data); totaltotal; - totalcalculateOperators: 'Addition' | 'Subtraction' | 'Multiplication' | 'Division' | 'Concatination' = "deployment_type" + totalcalculateOperators: 'Addition' | 'Subtraction' | 'Multiplication' | 'Division' | 'Concatination' = "Multiplication" onInputChangetotal(mode: 'add' | 'edit') { diff --git a/orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.service.ts b/orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.service.ts index 75b8fa1..b70a279 100644 --- a/orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.service.ts +++ b/orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.service.ts @@ -34,12 +34,12 @@ export class Customer_informationservice{ getAllmanufacturer(): Observable { -return this.apiRequest.get("Manufacturer_ListFilter1/Manufacturer_ListFilter1"); } +return this.apiRequest.get("_ListFilter1/_ListFilter1"); } gettypeDependent(field: string): Observable { - return this.apiRequest.get("Types_ListFilter1/Types_ListFilter11/" + field); + return this.apiRequest.get("_ListFilter1/_ListFilter11/" + field); } @@ -47,7 +47,7 @@ return this.apiRequest.get("Manufacturer_ListFilter1/Manufacturer_ListFilter1"); getproductDependent(field: string): Observable { - return this.apiRequest.get("Product_ListFilter1/Product_ListFilter11/" + field); + return this.apiRequest.get("_ListFilter1/_ListFilter11/" + field); } @@ -59,7 +59,7 @@ return this.apiRequest.get("Manufacturer_ListFilter1/Manufacturer_ListFilter1"); getAlldeployment_type(): Observable { -return this.apiRequest.get("Deployment_type_ListFilter1/Deployment_type_ListFilter1"); } +return this.apiRequest.get("_ListFilter1/_ListFilter1"); } 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 82d60e2..f07014c 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 @@ -3,6 +3,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'; @@ -276,6 +281,16 @@ const routes: Routes = [ + + + + + + + + + + {path:'Types',component:TypesComponent}, 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 7d552d1..57f4e83 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 @@ -3,6 +3,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'; @@ -149,6 +154,16 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S + + + + + + + + + + TypesComponent,