build_app

This commit is contained in:
risadmin_prod 2025-10-01 09:44:29 +00:00
parent cce2eb3985
commit b9becf05ca
9 changed files with 45 additions and 38 deletions

View File

@ -75,6 +75,9 @@ addCustomMenu( "Calculator","Calculator", "Transcations");
addCustomMenu( "Calculator","Calculator", "Transcations"); addCustomMenu( "Calculator","Calculator", "Transcations");
addCustomMenu( "Calculator","Calculator", "Transcations");
addCustomMenu( "Calculator","Calculator", "Transcations"); addCustomMenu( "Calculator","Calculator", "Transcations");

View File

@ -24,13 +24,13 @@ import com.realnet.WhoColumn.Entity.Extension;
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id; private Integer id;
private String display; private int number1;
private int input1; private int number2;
private String operation; private String operation;
private int input2; private int result;
} }

View File

@ -77,13 +77,13 @@ public Calculator getdetailsbyId(Integer id) {
public Calculator update(Calculator data,Integer id) { public Calculator update(Calculator data,Integer id) {
Calculator old = Repository.findById(id).get(); Calculator old = Repository.findById(id).get();
old.setDisplay(data.getDisplay()); old.setNumber1(data.getNumber1());
old.setInput1(data.getInput1()); old.setNumber2(data.getNumber2());
old.setOperation(data.getOperation()); old.setOperation(data.getOperation());
old.setInput2(data.getInput2()); old.setResult(data.getResult());
final Calculator test = Repository.save(old); final Calculator test = Repository.save(old);
data.setUpdatedBy(getUser().getUserId()); data.setUpdatedBy(getUser().getUserId());

View File

@ -1,4 +1,2 @@
CREATE TABLE calculator_app-d.Calculator(id BIGINT NOT NULL AUTO_INCREMENT, number2 int, number1 int, result int, PRIMARY KEY (id)); CREATE TABLE calculator_app-d.Calculator(id BIGINT NOT NULL AUTO_INCREMENT, number2 int, number1 int, operation VARCHAR(400), result int, PRIMARY KEY (id));
CREATE TABLE calculator_app-d.Calculator(id BIGINT NOT NULL AUTO_INCREMENT, input1 int, operation VARCHAR(400), input2 int, display VARCHAR(400), PRIMARY KEY (id));

View File

@ -23,11 +23,11 @@
<div *ngIf="error;else loadingSpinner">{{error}}</div> <div *ngIf="error;else loadingSpinner">{{error}}</div>
</clr-dg-placeholder> </clr-dg-placeholder>
<clr-dg-column [clrDgField]="'display'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Display <clr-dg-column [clrDgField]="'number1'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Number1
</ng-container></clr-dg-column> </ng-container></clr-dg-column>
<clr-dg-column [clrDgField]="'input1'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Input1 <clr-dg-column [clrDgField]="'number2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Number2
</ng-container></clr-dg-column> </ng-container></clr-dg-column>
@ -35,7 +35,7 @@
</ng-container></clr-dg-column> </ng-container></clr-dg-column>
<clr-dg-column [clrDgField]="'input2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Input2 <clr-dg-column [clrDgField]="'result'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Result
</ng-container></clr-dg-column> </ng-container></clr-dg-column>
@ -47,16 +47,16 @@
<clr-dg-row *clrDgItems="let user of product" [clrDgItem]="user"> <clr-dg-row *clrDgItems="let user of product" [clrDgItem]="user">
<clr-dg-cell>{{user.display }}</clr-dg-cell> <clr-dg-cell>{{user.number1 }}</clr-dg-cell>
<clr-dg-cell>{{user.input1 }}</clr-dg-cell> <clr-dg-cell>{{user.number2 }}</clr-dg-cell>
<clr-dg-cell>{{user.operation }}</clr-dg-cell> <clr-dg-cell>{{user.operation }}</clr-dg-cell>
<clr-dg-cell>{{user.input2 }}</clr-dg-cell> <clr-dg-cell>{{user.result }}</clr-dg-cell>
<!-- who column --> <!-- who column -->
@ -236,13 +236,13 @@
<form > <form >
<div class="clr-row"> <div class="clr-row">
<div class="clr-col-sm-12"> <div class="clr-col-sm-12">
<label>Display</label> <label>Number1</label>
<input class="clr-input" type="text" [(ngModel)]="rowSelected.display" name="display" /> <input id="name" class="clr-input" type="number" [(ngModel)]="rowSelected.number1" name="number1" />
</div> </div>
<div class="clr-col-sm-12"> <div class="clr-col-sm-12">
<label>Input1</label> <label>Number2</label>
<input id="name" class="clr-input" type="number" [(ngModel)]="rowSelected.input1" name="input1" /> <input id="name" class="clr-input" type="number" [(ngModel)]="rowSelected.number2" name="number2" />
</div> </div>
<div class="clr-col-sm-12"> <div class="clr-col-sm-12">
@ -251,8 +251,8 @@
</div> </div>
<div class="clr-col-sm-12"> <div class="clr-col-sm-12">
<label>Input2</label> <label>Result</label>
<input id="name" class="clr-input" type="number" [(ngModel)]="rowSelected.input2" name="input2" /> <input id="name" class="clr-input" type="number" [(ngModel)]="rowSelected.result" name="result" />
</div> </div>
</div> </div>
@ -330,15 +330,18 @@
<div class="clr-row" style="height: fit-content;"> <div class="clr-row" style="height: fit-content;">
<div class="clr-col-sm-12"> <div class="clr-col-sm-12">
<label> Display</label> <label> Number1</label>
<input class="clr-input" type="text" formControlName="display" /> <input class="clr-input" type="number" formControlName="number1" />
<div *ngIf="submitted && entryForm.controls.number1.errors" class="error_mess">
<div *ngIf="submitted && entryForm.controls.number1.errors.required" class="error_mess">*This field is Required</div>
</div>
</div> </div>
<div class="clr-col-sm-12"> <div class="clr-col-sm-12">
<label> Input1</label> <label> Number2</label>
<input class="clr-input" type="number" formControlName="input1" /> <input class="clr-input" type="number" formControlName="number2" />
<div *ngIf="submitted && entryForm.controls.input1.errors" class="error_mess"> <div *ngIf="submitted && entryForm.controls.number2.errors" class="error_mess">
<div *ngIf="submitted && entryForm.controls.input1.errors.required" class="error_mess">*This field is Required</div> <div *ngIf="submitted && entryForm.controls.number2.errors.required" class="error_mess">*This field is Required</div>
</div> </div>
</div> </div>
@ -348,10 +351,10 @@
</div> </div>
<div class="clr-col-sm-12"> <div class="clr-col-sm-12">
<label> Input2</label> <label> Result</label>
<input class="clr-input" type="number" formControlName="input2" /> <input class="clr-input" type="number" formControlName="result" />
<div *ngIf="submitted && entryForm.controls.input2.errors" class="error_mess"> <div *ngIf="submitted && entryForm.controls.result.errors" class="error_mess">
<div *ngIf="submitted && entryForm.controls.input2.errors.required" class="error_mess">*This field is Required</div> <div *ngIf="submitted && entryForm.controls.result.errors.required" class="error_mess">*This field is Required</div>
</div> </div>
</div> </div>

View File

@ -64,13 +64,13 @@ private userInfoService:UserInfoService,
this.userrole=this.userInfoService.getRoles(); this.userrole=this.userInfoService.getRoles();
this.getData(); this.getData();
this.entryForm = this._fb.group({ this.entryForm = this._fb.group({
display : [null], number1 : [null,[Validators.required]],
input1 : [null,[Validators.required]], number2 : [null,[Validators.required]],
operation : [null], operation : [null],
input2 : [null,[Validators.required]], result : [null,[Validators.required]],

View File

@ -1,5 +1,6 @@
import { CalculatorComponent } from './BuilderComponents/calculator_app-b/Calculator/Calculator.component'; import { CalculatorComponent } from './BuilderComponents/calculator_app-b/Calculator/Calculator.component';
import { SequencegenaratorComponent } from './fnd/sequencegenarator/sequencegenarator.component'; import { SequencegenaratorComponent } from './fnd/sequencegenarator/sequencegenarator.component';
@ -267,6 +268,8 @@ const routes: Routes = [
{path:'Calculator',component:CalculatorComponent}, {path:'Calculator',component:CalculatorComponent},

View File

@ -1,5 +1,6 @@
import { CalculatorComponent } from './BuilderComponents/calculator_app-b/Calculator/Calculator.component'; import { CalculatorComponent } from './BuilderComponents/calculator_app-b/Calculator/Calculator.component';
@ -140,6 +141,8 @@ import { MyworkspaceComponent } from './admin/myworkspace/myworkspace.component'
CalculatorComponent, CalculatorComponent,

View File

@ -228,10 +228,7 @@
"SUB_MENU": "Sub Menu", "SUB_MENU": "Sub Menu",
"Number2": "Number2", "Number2": "Number2",
"Number1": "Number1", "Number1": "Number1",
"Input1": "Input1",
"Calculator": "Calculator", "Calculator": "Calculator",
"Operation": "Operation", "Operation": "Operation",
"Input2": "Input2", "Result": "Result"
"Result": "Result",
"Display": "Display"
} }