build_app

This commit is contained in:
risadmin_prod 2025-10-01 09:41:50 +00:00
parent bdae4186a9
commit 89a173a96a
13 changed files with 145 additions and 34 deletions

View File

@ -72,6 +72,12 @@ public class BuilderService {
addCustomMenu( "Calculator","Calculator", "Transcations");
addCustomMenu( "Calculator","Calculator", "Transcations");
addCustomMenu( "Calculator","Calculator", "Transcations");
System.out.println("dashboard and menu inserted...");

View File

@ -22,6 +22,8 @@ import com.realnet.calculator_app-b.Services.CalculatorService ;
@RequestMapping(value = "/Calculator")
@CrossOrigin("*")
@RestController
@ -38,6 +40,8 @@ public class CalculatorController {
@PostMapping("/Calculator")
public Calculator Savedata(@RequestBody Calculator data) {
Calculator save = Service.Savedata(data) ;
@ -46,6 +50,8 @@ public class CalculatorController {
System.out.println("data saved..." + save);
return save;
@ -96,4 +102,6 @@ public class CalculatorController {
}

View File

@ -22,6 +22,8 @@ import com.realnet.calculator_app-b.Services.CalculatorService ;
@RequestMapping(value = "/token/Calculator")
@CrossOrigin("*")
@RestController
@ -38,6 +40,8 @@ public class tokenFree_CalculatorController {
@PostMapping("/Calculator")
public Calculator Savedata(@RequestBody Calculator data) {
Calculator save = Service.Savedata(data) ;
@ -46,6 +50,8 @@ public class tokenFree_CalculatorController {
System.out.println("data saved..." + save);
return save;
@ -96,4 +102,6 @@ public class tokenFree_CalculatorController {
}

View File

@ -10,6 +10,8 @@ import com.realnet.WhoColumn.Entity.Extension;
@Entity
@Data
public class Calculator extends Extension {
@ -22,11 +24,13 @@ import com.realnet.WhoColumn.Entity.Extension;
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Integer id;
private int number1;
private String display;
private int number2;
private int input1;
private String result;
private String operation;
private int input2;
}

View File

@ -18,6 +18,8 @@ import com.realnet.users.entity1.AppUser;
import org.springframework.stereotype.Service;
@Service
@ -33,6 +35,8 @@ private CalculatorRepository Repository;
public Calculator Savedata(Calculator data) {
@ -40,6 +44,8 @@ public Calculator Savedata(Calculator data) {
data.setUpdatedBy(getUser().getUserId());
data.setCreatedBy(getUser().getUserId());
data.setAccountId(getUser().getAccount().getAccount_id());
@ -71,11 +77,13 @@ public Calculator getdetailsbyId(Integer id) {
public Calculator update(Calculator data,Integer id) {
Calculator old = Repository.findById(id).get();
old.setNumber1(data.getNumber1());
old.setDisplay(data.getDisplay());
old.setNumber2(data.getNumber2());
old.setInput1(data.getInput1());
old.setResult(data.getResult());
old.setOperation(data.getOperation());
old.setInput2(data.getInput2());
final Calculator test = Repository.save(old);
data.setUpdatedBy(getUser().getUserId());
@ -86,6 +94,8 @@ final Calculator test = Repository.save(old);
public AppUser getUser() {
AppUser user = userService.getLoggedInUser();
return user;

View File

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

View File

@ -23,15 +23,19 @@
<div *ngIf="error;else loadingSpinner">{{error}}</div>
</clr-dg-placeholder>
<clr-dg-column [clrDgField]="'number1'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Number1
<clr-dg-column [clrDgField]="'display'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Display
</ng-container></clr-dg-column>
<clr-dg-column [clrDgField]="'number2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Number2
<clr-dg-column [clrDgField]="'input1'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Input1
</ng-container></clr-dg-column>
<clr-dg-column [clrDgField]="'result'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Result
<clr-dg-column [clrDgField]="'operation'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Operation
</ng-container></clr-dg-column>
<clr-dg-column [clrDgField]="'input2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Input2
</ng-container></clr-dg-column>
@ -43,13 +47,16 @@
<clr-dg-row *clrDgItems="let user of product" [clrDgItem]="user">
<clr-dg-cell>{{user.number1 }}</clr-dg-cell>
<clr-dg-cell>{{user.display }}</clr-dg-cell>
<clr-dg-cell>{{user.number2 }}</clr-dg-cell>
<clr-dg-cell>{{user.input1 }}</clr-dg-cell>
<clr-dg-cell>{{user.result }}</clr-dg-cell>
<clr-dg-cell>{{user.operation }}</clr-dg-cell>
<clr-dg-cell>{{user.input2 }}</clr-dg-cell>
<!-- who column -->
@ -209,6 +216,8 @@
<!-- // EDIT DATA......... -->
<clr-modal [(clrModalOpen)]="modalEdit" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
<h3 class="modal-title">Update Calculator
@ -218,6 +227,8 @@
</h3>
<div class="modal-body" *ngIf="rowSelected.id">
<h2 class="heading">{{rowSelected.id}}</h2>
@ -225,18 +236,23 @@
<form >
<div class="clr-row">
<div class="clr-col-sm-12">
<label>Number1</label>
<input id="name" class="clr-input" type="number" [(ngModel)]="rowSelected.number1" name="number1" />
<label>Display</label>
<input class="clr-input" type="text" [(ngModel)]="rowSelected.display" name="display" />
</div>
<div class="clr-col-sm-12">
<label>Number2</label>
<input id="name" class="clr-input" type="number" [(ngModel)]="rowSelected.number2" name="number2" />
<label>Input1</label>
<input id="name" class="clr-input" type="number" [(ngModel)]="rowSelected.input1" name="input1" />
</div>
<div class="clr-col-sm-12">
<label>Result</label>
<input class="clr-input" type="text" [(ngModel)]="rowSelected.result" name="result" />
<label>Operation</label>
<input class="clr-input" type="text" [(ngModel)]="rowSelected.operation" name="operation" />
</div>
<div class="clr-col-sm-12">
<label>Input2</label>
<input id="name" class="clr-input" type="number" [(ngModel)]="rowSelected.input2" name="input2" />
</div>
</div>
@ -246,6 +262,8 @@
<!-- form code start -->
<div *ngIf="checkFormCode">
<h4 style="font-weight: 300;display: inline;">Extension</h4>
@ -296,6 +314,8 @@
<!-- aeroplane icon -->
&nbsp; &nbsp; &nbsp; &nbsp;
<a *ngIf="userrole?.includes('ADMIN')" style="float: right;" href="javascript:void(0)" role="tooltip" aria-haspopup="true"
@ -310,24 +330,29 @@
<div class="clr-row" style="height: fit-content;">
<div class="clr-col-sm-12">
<label> Number1</label>
<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>
<label> Display</label>
<input class="clr-input" type="text" formControlName="display" />
</div>
<div class="clr-col-sm-12">
<label> Input1</label>
<input class="clr-input" type="number" formControlName="input1" />
<div *ngIf="submitted && entryForm.controls.input1.errors" class="error_mess">
<div *ngIf="submitted && entryForm.controls.input1.errors.required" class="error_mess">*This field is Required</div>
</div>
</div>
<div class="clr-col-sm-12">
<label> Number2</label>
<input class="clr-input" type="number" formControlName="number2" />
<div *ngIf="submitted && entryForm.controls.number2.errors" class="error_mess">
<div *ngIf="submitted && entryForm.controls.number2.errors.required" class="error_mess">*This field is Required</div>
</div>
<label> Operation</label>
<input class="clr-input" type="text" formControlName="operation" />
</div>
<div class="clr-col-sm-12">
<label> Result</label>
<input class="clr-input" type="text" formControlName="result" />
<label> Input2</label>
<input class="clr-input" type="number" formControlName="input2" />
<div *ngIf="submitted && entryForm.controls.input2.errors" class="error_mess">
<div *ngIf="submitted && entryForm.controls.input2.errors.required" class="error_mess">*This field is Required</div>
</div>
</div>
@ -338,6 +363,8 @@
<!-- form code start -->
@ -376,4 +403,6 @@
<!-- htmlpopup -->

View File

@ -64,11 +64,13 @@ private userInfoService:UserInfoService,
this.userrole=this.userInfoService.getRoles();
this.getData();
this.entryForm = this._fb.group({
number1 : [null,[Validators.required]],
display : [null],
number2 : [null,[Validators.required]],
input1 : [null,[Validators.required]],
result : [null],
operation : [null],
input2 : [null,[Validators.required]],
@ -77,6 +79,8 @@ result : [null],
}); // component_button200
// form code start
this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => {
@ -105,6 +109,8 @@ result : [null],
}
ngOnDestroy(): void {
@ -117,6 +123,8 @@ result : [null],
error;
getData() {
this.mainService.getAll().subscribe((data) => {
@ -140,6 +148,8 @@ this.product = [...this.product].reverse(); if(this.product.length==0){
this.modalEdit = true;
}
@ -166,6 +176,8 @@ this.product = [...this.product].reverse(); if(this.product.length==0){
//console.log("in update");
console.log("id " + id);
console.log(this.rowSelected);
@ -185,6 +197,8 @@ setTimeout(() => {
}, (error) => {
console.log(error);
if (error.status >= 200 && error.status <= 299) {
@ -209,6 +223,8 @@ onCreate() {
this.mainService.create(this.entryForm.value).subscribe(
(data) => {
console.log(data);
@ -223,6 +239,8 @@ setTimeout(() => {
}, (error) => {
console.log(error);
@ -247,6 +265,8 @@ this.modalAdd = true; this.submitted = false;
}
submitted = false;
@ -264,6 +284,8 @@ onSubmit() {
// updateaction
}
@ -271,3 +293,5 @@ onSubmit() {

View File

@ -1,3 +1,5 @@
import { CalculatorComponent } from './BuilderComponents/calculator_app-b/Calculator/Calculator.component';
import { SequencegenaratorComponent } from './fnd/sequencegenarator/sequencegenarator.component';
@ -261,6 +263,10 @@ const routes: Routes = [
// buildercomponents
{path:'Calculator',component:CalculatorComponent},

View File

@ -1,3 +1,5 @@
import { CalculatorComponent } from './BuilderComponents/calculator_app-b/Calculator/Calculator.component';
@ -134,6 +136,10 @@ import { MyworkspaceComponent } from './admin/myworkspace/myworkspace.component'
// buildercomponents
CalculatorComponent,

View File

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