From 8a1e57aed3b7559615e9c193a33b6d6b37b93489 Mon Sep 17 00:00:00 2001 From: risadmin_prod Date: Thu, 12 Jun 2025 16:58:34 +0000 Subject: [PATCH] build_app --- .../Builders/Services/BuilderService.java | 24 ++++++ .../Entity/Customer_information.java | 14 ++-- .../Customer_informationInsertService1.java | 10 +-- .../Services/Customer_informationService.java | 18 ++--- .../Customer_information.component.html | 74 +++++++++---------- .../Customer_information.component.ts | 28 +++---- .../app/modules/main/main-routing.module.ts | 24 ++++++ .../src/app/modules/main/main.module.ts | 24 ++++++ 8 files changed, 140 insertions(+), 76 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 66e7236..b5594fe 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 @@ -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"); 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 f263773..4d98016 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_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,19 +77,15 @@ private boolean busbar_monitoring; -private boolean lt_panel_monitoring; - - - private boolean water_management_stp_etp; -private boolean ht_panel_monitoring; +private boolean lt_panel_monitoring; -private boolean compressed_air__gas_monitoring; +private boolean ht_panel_monitoring; diff --git a/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Customer_informationInsertService1.java b/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Customer_informationInsertService1.java index 088b8ca..4ad3fa1 100644 --- a/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Customer_informationInsertService1.java +++ b/orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Customer_informationInsertService1.java @@ -21,15 +21,7 @@ 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); + final Customer_information save = Repository.save(customer_information); return save; } public AppUser getUser() { 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 052abdb..dcd1a01 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,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()); @@ -165,6 +161,10 @@ old.setCompressed_air_lpg_o2_n2_co2(data.isCompressed_air_lpg_o2_n2_co2()); old.setWater_management_water_monitoring(data.isWater_management_water_monitoring()); + +old.setWater_management_stp_etp(data.isWater_management_stp_etp()); + + 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 8974f8a..c387884 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 @@ - lt_panel_monitoring + dg_monitoring_with_fuel @@ -65,11 +65,6 @@ - dg_monitoring_with_fuel - - - - dg_monitoring_without_fuel @@ -90,7 +85,7 @@ - ht_panel_monitoring + lt_panel_monitoring @@ -100,6 +95,11 @@ + ht_panel_monitoring + + + + compressed_air__gas_monitoring @@ -147,7 +147,7 @@ -{{user. dg_monitoring_with_fuel}} +{{user. busbar_monitoring}} @@ -155,6 +155,14 @@ +{{user. water_management_stp_etp}} + + + +{{user. dg_monitoring_with_fuel}} + + + {{user. dg_monitoring_without_fuel}} @@ -167,10 +175,6 @@ -{{user. busbar_monitoring}} - - - {{user. lt_panel_monitoring}} @@ -183,10 +187,6 @@ -{{user. water_management_stp_etp}} - - - {{user. compressed_air_lpg_o2_n2_co2}} @@ -467,13 +467,6 @@ -
-
- - - - -
@@ -535,6 +528,13 @@ + + +
+
+ + + @@ -722,6 +722,12 @@ +
+ +
+ + +
@@ -746,12 +752,6 @@ -
- -
- - -
@@ -837,35 +837,35 @@
- +
- +
- +
- +
- +
- +
- +
- +

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 4ca643e..3ceadc6 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 @@ -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,11 +112,11 @@ ht_panel_monitoring:[false], -compressed_air__gas_monitoring:[false], +water_management_stp_etp:[false], -water_management_stp_etp:[false], +compressed_air__gas_monitoring:[false], @@ -150,14 +150,14 @@ water_management_water_monitoring:[false], }); // component_button200 // inser code start this.insertFormReset_btn = this._fb.group({ - customer_name: 'text', - email_address: 'email', - contact_person: 'text', - phone_number: 'phone', - select_objective: 'checkbox', - reset_btn: 'text', - customer_address: 'Paragraph', - deployment_type: 'select', + customer_name: '', + email_address: '', + contact_person: '', + phone_number: '', + select_objective: '', + reset_btn: '', + customer_address: '', + deployment_type: '', }); // insert code end 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 1931852..c627c17 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 @@ -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 = [ + + + + + + + + + + + + + + + + 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 82664dd..a0b7936 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 @@ -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 + + + + + + + + + + + + + + + +