diff --git a/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java b/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java index b23e3b3..55721c1 100644 --- a/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java +++ b/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java @@ -81,6 +81,21 @@ addCustomMenu( "Manufacturer","Manufacturer", "Transcations"); addCustomMenu( "Deployment_type","Deployment_type", "Transcations"); +addCustomMenu( "Customer_information","Customer_information", "Transcations"); + + +addCustomMenu( "Types","Types", "Transcations"); + + +addCustomMenu( "Product","Product", "Transcations"); + + +addCustomMenu( "Manufacturer","Manufacturer", "Transcations"); + + +addCustomMenu( "Deployment_type","Deployment_type", "Transcations"); + + addCustomMenu( "Customer_information","Customer_information", "Transcations"); diff --git a/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/Customer_informationController.java b/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/Customer_informationController.java index e246080..c8efcf1 100644 --- a/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/Customer_informationController.java +++ b/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/Customer_informationController.java @@ -43,8 +43,6 @@ import com.realnet.basicp1.Services.Customer_informationService ; - - @@ -85,8 +83,6 @@ public class Customer_informationController { - - @@ -119,8 +115,6 @@ public class Customer_informationController { - - @@ -195,8 +189,6 @@ public class Customer_informationController { - - diff --git a/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_Customer_informationController.java b/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_Customer_informationController.java index 2421035..d28d209 100644 --- a/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_Customer_informationController.java +++ b/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Controllers/tokenFree_Customer_informationController.java @@ -43,8 +43,6 @@ import com.realnet.basicp1.Services.Customer_informationService ; - - @@ -85,8 +83,6 @@ public class tokenFree_Customer_informationController { - - @@ -119,8 +115,6 @@ public class tokenFree_Customer_informationController { - - @@ -195,8 +189,6 @@ public class tokenFree_Customer_informationController { - - diff --git a/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Customer_information.java b/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Customer_information.java index 9009330..6b44e03 100644 --- a/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Customer_information.java +++ b/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Customer_information.java @@ -31,8 +31,6 @@ import com.realnet.WhoColumn.Entity.Extension; - - @@ -82,7 +80,7 @@ private String deployment_typename; -private Boolean dg_monitoring___with_fule; +private Boolean busbar_monitoring; @@ -90,7 +88,11 @@ private Boolean active_energy; -private Boolean dg_monitoring___without_fule; +private Boolean dg_monitoring__with_fule; + + + +private Boolean dg_monitoring_without_fule; @@ -102,10 +104,6 @@ private Boolean apfc_panel_monitoring; -private Boolean busbar_monitoring; - - - private Boolean lt_panel_monitoring; @@ -114,11 +112,11 @@ 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 compressed_air__lpg_n2_o2_co2; @@ -136,11 +134,9 @@ private int price; private String total; -private String descriptionn; +private String description; -private int gst; - } diff --git a/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/Customer_informationRepository.java b/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/Customer_informationRepository.java index 32f47af..79bccdc 100644 --- a/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/Customer_informationRepository.java +++ b/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Repository/Customer_informationRepository.java @@ -35,8 +35,6 @@ import java.util.*; - - diff --git a/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Customer_informationService.java b/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Customer_informationService.java index e3c5d40..6fc4eb5 100644 --- a/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Customer_informationService.java +++ b/testorderestimation-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Customer_informationService.java @@ -48,8 +48,6 @@ import com.realnet.basicp1.Services.Service; - - import org.springframework.stereotype.Service; @Service @@ -91,8 +89,6 @@ private Customer_informationRepository Repository; - - public Customer_information Savedata(Customer_information data) { @@ -160,8 +156,6 @@ if (data.getDeployment_type() != null) { - - data.setUpdatedBy(getUser().getUserId()); data.setCreatedBy(getUser().getUserId()); data.setAccountId(getUser().getAccount().getAccount_id()); @@ -219,7 +213,7 @@ old.setDeployment_type(data.getDeployment_type()); -old.setUps_monitoring(data.getUps_monitoring()); +old.setBusbar_monitoring(data.getBusbar_monitoring()); @@ -227,23 +221,23 @@ old.setActive_energy(data.getActive_energy()); -old.setDg_monitoring___with_fule(data.getDg_monitoring___with_fule()); - - - -old.setDg_monitoring___without_fule(data.getDg_monitoring___without_fule()); - - - old.setWater_management_stp_etp(data.getWater_management_stp_etp()); -old.setApfc_panel_monitoring(data.getApfc_panel_monitoring()); +old.setDg_monitoring__with_fule(data.getDg_monitoring__with_fule()); -old.setBusbar_monitoring(data.getBusbar_monitoring()); +old.setDg_monitoring_without_fule(data.getDg_monitoring_without_fule()); + + + +old.setUps_monitoring(data.getUps_monitoring()); + + + +old.setApfc_panel_monitoring(data.getApfc_panel_monitoring()); @@ -255,11 +249,11 @@ old.setHt_panel_monitoring(data.getHt_panel_monitoring()); -old.setCompressed_air__gag_monitoring(data.getCompressed_air__gag_monitoring()); +old.setCompressed_air_gag_monitoring(data.getCompressed_air_gag_monitoring()); -old.setCompressed_air___lpg_n2_o2_co2(data.getCompressed_air___lpg_n2_o2_co2()); +old.setCompressed_air__lpg_n2_o2_co2(data.getCompressed_air__lpg_n2_o2_co2()); @@ -275,12 +269,10 @@ old.setPrice(data.getPrice()); old.setTotal(data.getTotal()); -old.setDescriptionn(data.getDescriptionn()); +old.setDescription(data.getDescription()); -old.setGst(data.getGst()); - final Customer_information test = Repository.save(old); data.setUpdatedBy(getUser().getUserId()); return test;} @@ -311,8 +303,6 @@ final Customer_information test = Repository.save(old); - - diff --git a/testorderestimation-db-d/authsec_mysql/mysql/wf_table/wf_table.sql b/testorderestimation-db-d/authsec_mysql/mysql/wf_table/wf_table.sql index 789f4cd..cd5afae 100755 --- a/testorderestimation-db-d/authsec_mysql/mysql/wf_table/wf_table.sql +++ b/testorderestimation-db-d/authsec_mysql/mysql/wf_table/wf_table.sql @@ -1,4 +1,4 @@ -CREATE TABLE db.Customer_information(id BIGINT NOT NULL AUTO_INCREMENT, lt_panel_monitoring bit(1), contact_person VARCHAR(400), product VARCHAR(400), phone_number int, compressed_air_-_lpg/n2/o2/co2 bit(1), descriptionn VARCHAR(400), water_management-stp/etp bit(1), order_summary VARCHAR(400), manufacturer int, deployment_type int, compressed_air_-gag_monitoring bit(1), apfc_panel_monitoring bit(1), active_energy bit(1), ht_panel_monitoring bit(1), email_address VARCHAR(400), dg_monitoring_-_with_fule bit(1), quantity int, gst int, ups_monitoring bit(1), water_management-water_monitoring bit(1), type VARCHAR(400), dg_monitoring_-_without_fule bit(1), price int, busbar_monitoring bit(1), total VARCHAR(400), company_name VARCHAR(400), customer_address VARCHAR(400), PRIMARY KEY (id)); +CREATE TABLE db.Customer_information(id BIGINT NOT NULL AUTO_INCREMENT, lt_panel_monitoring bit(1), description VARCHAR(400), contact_person VARCHAR(400), product VARCHAR(400), phone_number int, total VARCHAR(400), order_summary VARCHAR(400), manufacturer int, deployment_type int, apfc_panel_monitoring bit(1), active_energy bit(1), ht_panel_monitoring bit(1), email_address VARCHAR(400), water_management_stp/etp bit(1), quantity int, ups_monitoring bit(1), dg_monitoring__with_fule bit(1), water_management_water_monitoring bit(1), dg_monitoring_without_fule bit(1), type VARCHAR(400), price int, busbar_monitoring bit(1), company_name VARCHAR(400), compressed_air_gag_monitoring bit(1), compressed_air__lpg_n2_o2_co2 bit(1), customer_address VARCHAR(400), PRIMARY KEY (id)); CREATE TABLE db.Deployment_type(id BIGINT NOT NULL AUTO_INCREMENT, deployment_type VARCHAR(400), PRIMARY KEY (id)); diff --git a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.html b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.html index 9396f3e..8434219 100644 --- a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.html +++ b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.html @@ -61,22 +61,17 @@ + dg monitoring without fule + + + + active energy - dg monitoring - with fule - - - - - dg monitoring - without fule - - - - - water management-stp/etp + dg monitoring with fule @@ -106,17 +101,22 @@ - compressed air -gag monitoring + compressed air gag monitoring - compressed air - lpg/n2/o2/co2 + compressed air lpg n2 o2 co2 - water management-water monitoring + water management water monitoring + + + + + water management stp/etp @@ -133,15 +133,11 @@ - Descriptionn + Description - - GST - - @@ -181,7 +177,7 @@ -{{user.dg_monitoring___without_fule}} +{{user.lt_panel_monitoring}} @@ -189,7 +185,11 @@ -{{user.dg_monitoring___with_fule}} +{{user.dg_monitoring__with_fule}} + + + +{{user.dg_monitoring_without_fule}} @@ -197,6 +197,10 @@ +{{user.water_management_stp_etp}} + + + {{user.apfc_panel_monitoring}} @@ -205,29 +209,21 @@ -{{user.lt_panel_monitoring}} - - - {{user.ht_panel_monitoring}} -{{user.compressed_air__gag_monitoring}} +{{user.compressed_air_gag_monitoring}} -{{user.compressed_air___lpg_n2_o2_co2}} +{{user.compressed_air__lpg_n2_o2_co2}} {{user.water_management_water_monitoring}} - -{{user.water_management_stp_etp}} - - @@ -239,13 +235,10 @@ -{{user.descriptionn }} +{{user.description }} - -{{user.gst }} - @@ -436,8 +429,6 @@ - -

Update Customer Information @@ -471,8 +462,6 @@ - -

{{rowSelected.id}}

@@ -556,7 +545,7 @@
+ @@ -568,8 +557,8 @@ -
-
+
+
@@ -582,22 +571,8 @@ -
-
- - - - - -
-
- - - - - -
-
+
+
@@ -617,6 +592,13 @@ +
+
+ + + + +
@@ -624,6 +606,13 @@ +
+
+ + + + +
@@ -631,22 +620,22 @@ -
-
+
+
-
-
+
+
-
+ @@ -667,22 +656,17 @@
- +
- - + +
-
- - -
- @@ -711,8 +695,6 @@ - - @@ -790,8 +772,6 @@ - -         Deployment Type @@ -897,8 +877,8 @@
- -
+ + @@ -909,14 +889,14 @@
- -
+ +
- -
+ + @@ -945,26 +925,26 @@
- -
+ +
- -
- - - -
- -
+ +
-
+ + + + +
+ +
@@ -987,25 +967,17 @@
- +
- - + +
-
- - -
-
*This field is Required
-
-
- @@ -1035,8 +1007,6 @@ - - @@ -1132,10 +1102,6 @@ total - - gst - - @@ -1159,10 +1125,6 @@ {{user.total}} - - {{user.gst}} - - @@ -1172,6 +1134,4 @@ - - diff --git a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.ts b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.ts index 181062b..390d573 100644 --- a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.ts +++ b/testorderestimation-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], -dg_monitoring___without_fule:[false], +dg_monitoring__with_fule:[false], @@ -94,7 +94,11 @@ active_energy:[false], -dg_monitoring___with_fule:[false], +water_management_stp_etp:[false], + + + +dg_monitoring_without_fule:[false], @@ -106,10 +110,6 @@ apfc_panel_monitoring:[false], -water_management_stp_etp:[false], - - - busbar_monitoring:[false], @@ -122,11 +122,11 @@ ht_panel_monitoring:[false], -compressed_air__gag_monitoring:[false], +compressed_air_gag_monitoring:[false], -compressed_air___lpg_n2_o2_co2:[false], +compressed_air__lpg_n2_o2_co2:[false], @@ -140,12 +140,10 @@ price : [null,[Validators.required]], -descriptionn : [null], +description : [null], -gst : [null,[Validators.required]], - @@ -174,8 +172,6 @@ gst : [null,[Validators.required]], - - @@ -269,8 +265,6 @@ this.getalldeployment_type(); - - } ngOnDestroy(): void { @@ -304,8 +298,6 @@ this.getalldeployment_type(); - - @@ -357,8 +349,6 @@ this.dependet2product(row.dependentDD); - - @@ -415,8 +405,6 @@ this.onInputChangetotal ('edit'); - - //console.log("in update"); console.log("id " + id); console.log(this.rowSelected); @@ -457,8 +445,6 @@ setTimeout(() => { - - @@ -507,8 +493,6 @@ onCreate() { - - @@ -547,8 +531,6 @@ setTimeout(() => { - - @@ -597,8 +579,6 @@ this.modalAdd = true; this.submitted = false; - - @@ -844,10 +824,6 @@ getcustorder_summaryID(id:number){ this.entryForm.get('total').setValue(data.total); - - this.entryForm.get('gst').setValue(data.gst); - - }else if(this.valuelistMode == "EDIT"){ @@ -872,16 +848,10 @@ getcustorder_summaryID(id:number){ this.rowSelected.total= data. total - - this.rowSelected.gst= data. gst - - } }); this.valueListModalorder_summary =false; } //value List field end - - // updateaction } @@ -910,8 +880,6 @@ getcustorder_summaryID(id:number){ - - diff --git a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.service.ts b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.service.ts index a43af56..f1eb15f 100644 --- a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.service.ts +++ b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.service.ts @@ -73,7 +73,5 @@ return this.apiRequest.get("_ListFilter1/_ListFilter1"); } - - // updateaction } \ No newline at end of file diff --git a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts index f96c6f4..82d60e2 100644 --- a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts +++ b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts @@ -1,3 +1,8 @@ + + + + + import { TypesComponent } from './BuilderComponents/basicp1/Types/Types.component'; import { ProductComponent } from './BuilderComponents/basicp1/Product/Product.component'; import { ManufacturerComponent } from './BuilderComponents/basicp1/Manufacturer/Manufacturer.component'; @@ -261,6 +266,16 @@ const routes: Routes = [ // buildercomponents + + + + + + + + + + {path:'Types',component:TypesComponent}, diff --git a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts index 5025c00..7d552d1 100644 --- a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts +++ b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts @@ -1,3 +1,8 @@ + + + + + import { TypesComponent } from './BuilderComponents/basicp1/Types/Types.component'; import { ProductComponent } from './BuilderComponents/basicp1/Product/Product.component'; import { ManufacturerComponent } from './BuilderComponents/basicp1/Manufacturer/Manufacturer.component'; @@ -134,6 +139,16 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S // buildercomponents + + + + + + + + + + TypesComponent, diff --git a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json index 9c84d6c..3d7ac39 100644 --- a/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json +++ b/testorderestimation-front-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json @@ -232,33 +232,31 @@ "Contact_Person": "Contact_Person", "Product": "Product", "Phone_Number": "Phone_Number", - "Compressed_Air_-_LPG/N2/O2/CO2": "Compressed_Air_-_LPG/N2/O2/CO2", "Manufacturer_name": "Manufacturer_name", - "Descriptionn": "Descriptionn", - "Water_Management-STP/ETP": "Water_Management-STP/ETP", + "total": "total", "Order_Summary": "Order_Summary", "Manufacturer": "Manufacturer", "Deployment_Type": "Deployment_Type", - "Compressed_Air_-Gag_Monitoring": "Compressed_Air_-Gag_Monitoring", "APFC_Panel_Monitoring": "APFC_Panel_Monitoring", "Active_Energy": "Active_Energy", "Type_Name": "Type_Name", "HT_Panel_Monitoring": "HT_Panel_Monitoring", "Email_Address": "Email_Address", "Customer_information": "Customer_information", - "DG_Monitoring_-_with_fule": "DG_Monitoring_-_with_fule", + "Water_Management_STP/ETP": "Water_Management_STP/ETP", "Quantity": "Quantity", - "GST": "GST", "Product_Name": "Product_Name", "UPS_Monitoring": "UPS_Monitoring", "Deployment_type": "Deployment_type", - "Water_Management-water_Monitoring": "Water_Management-water_Monitoring", + "DG_Monitoring__with_fule": "DG_Monitoring__with_fule", + "Water_Management_water_Monitoring": "Water_Management_water_Monitoring", + "DG_Monitoring_without_fule": "DG_Monitoring_without_fule", "Type": "Type", "Type_name": "Type_name", - "DG_Monitoring_-_without_fule": "DG_Monitoring_-_without_fule", "Price": "Price", "Busbar_Monitoring": "Busbar_Monitoring", - "Total": "Total", "Company_Name": "Company_Name", + "Compressed_Air_Gag_Monitoring": "Compressed_Air_Gag_Monitoring", + "Compressed_Air__LPG_N2_O2_CO2": "Compressed_Air__LPG_N2_O2_CO2", "Customer_Address": "Customer_Address" } \ No newline at end of file