risadmin_prod/orderestimate5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build_app

Browse Source
This commit is contained in:
risadmin_prod 2025-06-12 16:52:53 +00:00
parent b5011ef7b8
commit 416040370b
8 changed files with 127 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java
View File

@ -90,6 +90,30 @@ addCustomMenu( "Type","Type", "Transcations");
addCustomMenu( "Product_selection","Product_selection", "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"); addCustomMenu( "Customer_information","Customer_information", "Transcations");

12
orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Entity/Customer_information.java
View File

@ -49,7 +49,7 @@ private String deployment_type;
private boolean dg_monitoring_without_fuel; private boolean dg_monitoring_with_fuel;
@ -57,7 +57,7 @@ private boolean active_energy;
private boolean dg_monitoring_with_fuel; private boolean dg_monitoring_without_fuel;
@ -77,6 +77,10 @@ private boolean lt_panel_monitoring;
private boolean water_management_stp_etp;
private boolean ht_panel_monitoring; private boolean ht_panel_monitoring;
@ -92,10 +96,6 @@ private boolean compressed_air_lpg_o2_n2_co2;
private boolean water_management_water_monitoring; private boolean water_management_water_monitoring;
private boolean water_management_stp_etp;

12
orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Customer_informationService.java
View File

@ -118,6 +118,10 @@ old.setDeployment_type(data.getDeployment_type());
old.setUps_monitoring(data.isUps_monitoring());
old.setActive_energy(data.isActive_energy()); old.setActive_energy(data.isActive_energy());
@ -130,19 +134,15 @@ 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.setApfc_panel_monitoring(data.isApfc_panel_monitoring());
old.setWater_management_stp_etp(data.isWater_management_stp_etp()); old.setBusbar_monitoring(data.isBusbar_monitoring());
old.setBusbar_monitoring(data.isBusbar_monitoring()); old.setWater_management_stp_etp(data.isWater_management_stp_etp());

4
orderestimate5-orderestimationback-b/authsec_springboot/backend/src/main/java/com/realnet/order_estimation/Services/Product_selectionService.java
View File

@ -71,7 +71,7 @@ public Product_selection Savedata(Product_selection data) {
if (data.getManufacturer() != null) { if (data.getManufacturer() != null) {
Manufacturer get = manufacturerserv.getdetailsbyId(data.getManufacturer()); Manufacturer get = manufacturerserv.getdetailsbyId(data.getManufacturer());
data.setManufacturername(get.getManufacturer_Name()); data.setManufacturername(get.getManufacturer_name());
} }
@ -93,7 +93,7 @@ if (data.getType() != null) {
if (data.getProduct() != null) { if (data.getProduct() != null) {
Productss get = productserv.getdetailsbyId(data.getProduct()); Productss get = productserv.getdetailsbyId(data.getProduct());
data.setProductname(get.getProduct_Name()); data.setProductname(get.getProduct_name());
} }

74
orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/order_estimation/Customer_information/Customer_information.component.html
View File

@ -55,7 +55,7 @@
<clr-dg-column [clrDgField]="' dg_monitoring_with_fuel'"> <ng-container *clrDgHideableColumn="{hidden: false}"> dg_monitoring_with_fuel <clr-dg-column [clrDgField]="' lt_panel_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> lt_panel_monitoring
</ng-container></clr-dg-column> </ng-container></clr-dg-column>
@ -65,6 +65,11 @@
<clr-dg-column [clrDgField]="' dg_monitoring_with_fuel'"> <ng-container *clrDgHideableColumn="{hidden: false}"> dg_monitoring_with_fuel
</ng-container></clr-dg-column>
<clr-dg-column [clrDgField]="' dg_monitoring_without_fuel'"> <ng-container *clrDgHideableColumn="{hidden: false}"> dg_monitoring_without_fuel <clr-dg-column [clrDgField]="' dg_monitoring_without_fuel'"> <ng-container *clrDgHideableColumn="{hidden: false}"> dg_monitoring_without_fuel
</ng-container></clr-dg-column> </ng-container></clr-dg-column>
@ -85,12 +90,12 @@
<clr-dg-column [clrDgField]="' lt_panel_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> lt_panel_monitoring <clr-dg-column [clrDgField]="' ht_panel_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> ht_panel_monitoring
</ng-container></clr-dg-column> </ng-container></clr-dg-column>
<clr-dg-column [clrDgField]="' ht_panel_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> ht_panel_monitoring <clr-dg-column [clrDgField]="' water_management_stp_etp'"> <ng-container *clrDgHideableColumn="{hidden: false}"> water_management_stp_etp
</ng-container></clr-dg-column> </ng-container></clr-dg-column>
@ -105,11 +110,6 @@
<clr-dg-column [clrDgField]="' water_management_stp_etp'"> <ng-container *clrDgHideableColumn="{hidden: false}"> water_management_stp_etp
</ng-container></clr-dg-column>
<clr-dg-column [clrDgField]="' water_management_water_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> water_management_water_monitoring <clr-dg-column [clrDgField]="' water_management_water_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> water_management_water_monitoring
</ng-container></clr-dg-column> </ng-container></clr-dg-column>
@ -147,7 +147,7 @@
<clr-dg-cell>{{user. dg_monitoring_without_fuel}}</clr-dg-cell> <clr-dg-cell>{{user. dg_monitoring_with_fuel}}</clr-dg-cell>
@ -155,7 +155,7 @@
<clr-dg-cell>{{user. dg_monitoring_with_fuel}}</clr-dg-cell> <clr-dg-cell>{{user. dg_monitoring_without_fuel}}</clr-dg-cell>
@ -179,11 +179,11 @@
<clr-dg-cell>{{user. water_management_stp_etp}}</clr-dg-cell> <clr-dg-cell>{{user. compressed_air__gas_monitoring}}</clr-dg-cell>
<clr-dg-cell>{{user. compressed_air__gas_monitoring}}</clr-dg-cell> <clr-dg-cell>{{user. water_management_stp_etp}}</clr-dg-cell>
@ -453,8 +453,8 @@
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="busbar_monitoring" name="busbar_monitoring" [(ngModel)]="rowSelected.busbar_monitoring" class="clr-checkbox" /> <div class="clr-checkbox-wrapper"> <input type="checkbox" id="ups_monitoring" name="ups_monitoring" [(ngModel)]="rowSelected.ups_monitoring" class="clr-checkbox" />
<label for="busbar_monitoring" class="clr-control-label"> busbar_monitoring</label> </div> <label for="ups_monitoring" class="clr-control-label"> ups_monitoring</label> </div>
@ -467,6 +467,13 @@
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="water_management_stp_etp" name="water_management_stp_etp" [(ngModel)]="rowSelected.water_management_stp_etp" class="clr-checkbox" />
<label for="water_management_stp_etp" class="clr-control-label"> water_management_stp_etp</label> </div>
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="dg_monitoring_with_fuel" name="dg_monitoring_with_fuel" [(ngModel)]="rowSelected.dg_monitoring_with_fuel" class="clr-checkbox" /> <div class="clr-checkbox-wrapper"> <input type="checkbox" id="dg_monitoring_with_fuel" name="dg_monitoring_with_fuel" [(ngModel)]="rowSelected.dg_monitoring_with_fuel" class="clr-checkbox" />
<label for="dg_monitoring_with_fuel" class="clr-control-label"> dg_monitoring_with_fuel</label> </div> <label for="dg_monitoring_with_fuel" class="clr-control-label"> dg_monitoring_with_fuel</label> </div>
@ -481,15 +488,15 @@
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="ups_monitoring" name="ups_monitoring" [(ngModel)]="rowSelected.ups_monitoring" class="clr-checkbox" /> <div class="clr-checkbox-wrapper"> <input type="checkbox" id="apfc_panel_monitoring" name="apfc_panel_monitoring" [(ngModel)]="rowSelected.apfc_panel_monitoring" class="clr-checkbox" />
<label for="ups_monitoring" class="clr-control-label"> ups_monitoring</label> </div> <label for="apfc_panel_monitoring" class="clr-control-label"> apfc_panel_monitoring</label> </div>
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="apfc_panel_monitoring" name="apfc_panel_monitoring" [(ngModel)]="rowSelected.apfc_panel_monitoring" class="clr-checkbox" /> <div class="clr-checkbox-wrapper"> <input type="checkbox" id="busbar_monitoring" name="busbar_monitoring" [(ngModel)]="rowSelected.busbar_monitoring" class="clr-checkbox" />
<label for="apfc_panel_monitoring" class="clr-control-label"> apfc_panel_monitoring</label> </div> <label for="busbar_monitoring" class="clr-control-label"> busbar_monitoring</label> </div>
@ -528,13 +535,6 @@
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="water_management_stp_etp" name="water_management_stp_etp" [(ngModel)]="rowSelected.water_management_stp_etp" class="clr-checkbox" />
<label for="water_management_stp_etp" class="clr-control-label"> water_management_stp_etp</label> </div>
</div> </div>
</div> </div>
@ -686,6 +686,12 @@
<div class="clr-checkbox-wrapper">
<input type="checkbox" id="dg_monitoring_without_fuel" formControlName="dg_monitoring_without_fuel" class="clr-checkbox" />
<label for="dg_monitoring_without_fuel" class="clr-control-label">dg_monitoring_without_fuel</label> </div>
<div class="clr-checkbox-wrapper"> <div class="clr-checkbox-wrapper">
<input type="checkbox" id="active_energy" formControlName="active_energy" class="clr-checkbox" /> <input type="checkbox" id="active_energy" formControlName="active_energy" class="clr-checkbox" />
<label for="active_energy" class="clr-control-label">active_energy</label> </div> <label for="active_energy" class="clr-control-label">active_energy</label> </div>
@ -698,18 +704,6 @@
<div class="clr-checkbox-wrapper">
<input type="checkbox" id="water_management_stp_etp" formControlName="water_management_stp_etp" class="clr-checkbox" />
<label for="water_management_stp_etp" class="clr-control-label">water_management_stp_etp</label> </div>
<div class="clr-checkbox-wrapper">
<input type="checkbox" id="dg_monitoring_without_fuel" formControlName="dg_monitoring_without_fuel" class="clr-checkbox" />
<label for="dg_monitoring_without_fuel" class="clr-control-label">dg_monitoring_without_fuel</label> </div>
<div class="clr-checkbox-wrapper"> <div class="clr-checkbox-wrapper">
<input type="checkbox" id="ups_monitoring" formControlName="ups_monitoring" class="clr-checkbox" /> <input type="checkbox" id="ups_monitoring" formControlName="ups_monitoring" class="clr-checkbox" />
<label for="ups_monitoring" class="clr-control-label">ups_monitoring</label> </div> <label for="ups_monitoring" class="clr-control-label">ups_monitoring</label> </div>
@ -752,6 +746,12 @@
<div class="clr-checkbox-wrapper">
<input type="checkbox" id="water_management_stp_etp" formControlName="water_management_stp_etp" class="clr-checkbox" />
<label for="water_management_stp_etp" class="clr-control-label">water_management_stp_etp</label> </div>
<div class="clr-checkbox-wrapper"> <div class="clr-checkbox-wrapper">
<input type="checkbox" id="water_management_water_monitoring" formControlName="water_management_water_monitoring" class="clr-checkbox" /> <input type="checkbox" id="water_management_water_monitoring" formControlName="water_management_water_monitoring" class="clr-checkbox" />
<label for="water_management_water_monitoring" class="clr-control-label">water_management_water_monitoring</label> </div> <label for="water_management_water_monitoring" class="clr-control-label">water_management_water_monitoring</label> </div>

8
orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/order_estimation/Customer_information/Customer_information.component.ts
View File

@ -96,10 +96,6 @@ dg_monitoring_without_fuel:[false],
water_management_stp_etp:[false],
ups_monitoring:[false], ups_monitoring:[false],
@ -120,6 +116,10 @@ compressed_air__gas_monitoring:[false],
water_management_stp_etp:[false],
compressed_air_lpg_o2_n2_co2:[false], compressed_air_lpg_o2_n2_co2:[false],

24
orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts
View File

@ -1,3 +1,11 @@
import { Generate_quoteComponent } from './BuilderComponents/order_estimation/Generate_quote/Generate_quote.component'; 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 { 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'; import { Order_summaryComponent } from './BuilderComponents/order_estimation/Order_summary/Order_summary.component';
@ -265,6 +273,22 @@ const routes: Routes = [
// buildercomponents // buildercomponents
{path:'Generate_quote',component:Generate_quoteComponent}, {path:'Generate_quote',component:Generate_quoteComponent},

24
orderestimate5-orderestimationfront-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts
View File

@ -1,3 +1,11 @@
import { Generate_quoteComponent } from './BuilderComponents/order_estimation/Generate_quote/Generate_quote.component'; 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 { 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'; import { Order_summaryComponent } from './BuilderComponents/order_estimation/Order_summary/Order_summary.component';
@ -137,6 +145,22 @@ import { Stepper_workflowComponent } from './BuilderComponents/stepperworkflow/S
// buildercomponents // buildercomponents
Generate_quoteComponent, Generate_quoteComponent,