risadmin_prod/orderestimation0010
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-07-23 12:49:33 +00:00
parent b987dabffa
commit aedfc06a60
8 changed files with 114 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
orderestimation0010-back-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java
View File

@ -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");

26
orderestimation0010-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Entity/Customer_information.java
View File

@ -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;

28
orderestimation0010-back-b/authsec_springboot/backend/src/main/java/com/realnet/basicp1/Services/Customer_informationService.java
View File

@ -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());

66
orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.html
View File

@ -61,7 +61,7 @@
<clr-dg-column [clrDgField]="' compressed_air__gag_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> compressed air -gag monitoring
<clr-dg-column [clrDgField]="' busbar_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> busbar monitoring
</ng-container></clr-dg-column>
@ -86,12 +86,12 @@
<clr-dg-column [clrDgField]="' apfc_panel_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> apfc panel monitoring
<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]="' busbar_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> busbar monitoring
<clr-dg-column [clrDgField]="' apfc_panel_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> apfc panel monitoring
</ng-container></clr-dg-column>
@ -106,7 +106,7 @@
<clr-dg-column [clrDgField]="' water_management_stp_etp'"> <ng-container *clrDgHideableColumn="{hidden: false}"> water management-stp/etp
<clr-dg-column [clrDgField]="' compressed_air__gag_monitoring'"> <ng-container *clrDgHideableColumn="{hidden: false}"> compressed air -gag monitoring
</ng-container></clr-dg-column>
@ -171,6 +171,10 @@
<clr-dg-cell>{{user.ups_monitoring}}</clr-dg-cell>
<clr-dg-cell>{{user.active_energy}}</clr-dg-cell>
@ -183,10 +187,6 @@
<clr-dg-cell>{{user.ups_monitoring}}</clr-dg-cell>
<clr-dg-cell>{{user.apfc_panel_monitoring}}</clr-dg-cell>
@ -538,13 +538,6 @@
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="dg_monitoring___with_fule" name="dg_monitoring___with_fule" [(ngModel)]="rowSelected.dg_monitoring___with_fule" class="clr-checkbox" />
<label for="dg_monitoring___with_fule" class="clr-control-label"> dg monitoring - with fule</label> </div>
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="active_energy" name="active_energy" [(ngModel)]="rowSelected.active_energy" class="clr-checkbox" />
<label for="active_energy" class="clr-control-label"> active energy</label> </div>
@ -552,15 +545,15 @@
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="dg_monitoring___without_fule" name="dg_monitoring___without_fule" [(ngModel)]="rowSelected.dg_monitoring___without_fule" class="clr-checkbox" />
<label for="dg_monitoring___without_fule" class="clr-control-label"> dg monitoring - without fule</label> </div>
<div class="clr-checkbox-wrapper"> <input type="checkbox" id="dg_monitoring___with_fule" name="dg_monitoring___with_fule" [(ngModel)]="rowSelected.dg_monitoring___with_fule" class="clr-checkbox" />
<label for="dg_monitoring___with_fule" class="clr-control-label"> dg monitoring - with fule</label> </div>
<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___without_fule" name="dg_monitoring___without_fule" [(ngModel)]="rowSelected.dg_monitoring___without_fule" class="clr-checkbox" />
<label for="dg_monitoring___without_fule" class="clr-control-label"> dg monitoring - without fule</label> </div>
@ -601,6 +594,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="compressed_air__gag_monitoring" name="compressed_air__gag_monitoring" [(ngModel)]="rowSelected.compressed_air__gag_monitoring" class="clr-checkbox" />
<label for="compressed_air__gag_monitoring" class="clr-control-label"> compressed air -gag monitoring</label> </div>
@ -843,8 +843,8 @@
<div class="clr-checkbox-wrapper">
<input type="checkbox" id="ht_panel_monitoring" formControlName="ht_panel_monitoring" class="clr-checkbox" />
<label for="ht_panel_monitoring" class="clr-control-label">ht panel monitoring</label> </div>
<input type="checkbox" id="ups_monitoring" formControlName="ups_monitoring" class="clr-checkbox" />
<label for="ups_monitoring" class="clr-control-label">ups monitoring</label> </div>
@ -854,12 +854,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___with_fule" formControlName="dg_monitoring___with_fule" class="clr-checkbox" />
<label for="dg_monitoring___with_fule" class="clr-control-label">dg monitoring - with fule</label> </div>
@ -872,12 +866,6 @@
<div class="clr-checkbox-wrapper">
<input type="checkbox" id="ups_monitoring" formControlName="ups_monitoring" class="clr-checkbox" />
<label for="ups_monitoring" class="clr-control-label">ups monitoring</label> </div>
<div class="clr-checkbox-wrapper">
<input type="checkbox" id="apfc_panel_monitoring" formControlName="apfc_panel_monitoring" class="clr-checkbox" />
<label for="apfc_panel_monitoring" class="clr-control-label">apfc panel monitoring</label> </div>
@ -896,6 +884,18 @@
<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="ht_panel_monitoring" formControlName="ht_panel_monitoring" class="clr-checkbox" />
<label for="ht_panel_monitoring" class="clr-control-label">ht panel monitoring</label> </div>
<div class="clr-checkbox-wrapper">
<input type="checkbox" id="compressed_air__gag_monitoring" formControlName="compressed_air__gag_monitoring" class="clr-checkbox" />
<label for="compressed_air__gag_monitoring" class="clr-control-label">compressed air -gag monitoring</label> </div>

10
orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.component.ts
View File

@ -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') {

8
orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/basicp1/Customer_information/Customer_information.service.ts
View File

@ -34,12 +34,12 @@ export class Customer_informationservice{
getAllmanufacturer(): Observable<any> {
return this.apiRequest.get("Manufacturer_ListFilter1/Manufacturer_ListFilter1"); }
return this.apiRequest.get("_ListFilter1/_ListFilter1"); }
gettypeDependent(field: string): Observable<any> {
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<any> {
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<any> {
return this.apiRequest.get("Deployment_type_ListFilter1/Deployment_type_ListFilter1"); }
return this.apiRequest.get("_ListFilter1/_ListFilter1"); }

15
orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts
View File

@ -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},

15
orderestimation0010-front-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts
View File

@ -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,