From 7ec353c8a124564dd005a6a4495ea96574e8e488 Mon Sep 17 00:00:00 2001 From: risadmin_prod Date: Sat, 4 Oct 2025 05:17:57 +0000 Subject: [PATCH] build_app --- .../Builders/Services/BuilderService.java | 3 ++ .../Controllers/CalculatorController.java | 8 +++ .../tokenFree_CalculatorController.java | 8 +++ .../com/realnet/app-b/Entity/Calculator.java | 6 ++- .../Repository/CalculatorRepository.java | 2 + .../app-b/Services/CalculatorService.java | 10 ++++ .../authsec_mysql/mysql/wf_table/wf_table.sql | 2 +- .../Calculator/Calculator.component.html | 54 +++++++++++++++---- .../app-b/Calculator/Calculator.component.ts | 26 ++++++++- .../app-b/Calculator/Calculator.service.ts | 2 + .../app/modules/main/main-routing.module.ts | 3 ++ .../src/app/modules/main/main.module.ts | 3 ++ .../src/assets/i18n/en.json | 5 ++ 13 files changed, 118 insertions(+), 14 deletions(-) diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java index 876a0b2..8586004 100644 --- a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java @@ -69,6 +69,9 @@ public class BuilderService { executeDump(true); // ADD OTHER SERVICE +addCustomMenu( "Calculator","Calculator", "Transcations"); + + addCustomMenu( "Todoapp","Todoapp", "Transcations"); diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/CalculatorController.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/CalculatorController.java index 81e15d4..7e96299 100644 --- a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/CalculatorController.java +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/CalculatorController.java @@ -22,6 +22,8 @@ import com.realnet.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 { + + } \ No newline at end of file diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/tokenFree_CalculatorController.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/tokenFree_CalculatorController.java index eb55401..552575f 100644 --- a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/tokenFree_CalculatorController.java +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Controllers/tokenFree_CalculatorController.java @@ -22,6 +22,8 @@ import com.realnet.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 { + + } \ No newline at end of file diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Entity/Calculator.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Entity/Calculator.java index 23cdd45..414e615 100644 --- a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Entity/Calculator.java +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Entity/Calculator.java @@ -10,6 +10,8 @@ import com.realnet.WhoColumn.Entity.Extension; + + @Entity @Data public class Calculator extends Extension { @@ -26,7 +28,9 @@ private int number1; private int number2; -private String result; +private String operation; + +private int result; } diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Repository/CalculatorRepository.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Repository/CalculatorRepository.java index 0ce09ef..e6da5bb 100644 --- a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Repository/CalculatorRepository.java +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Repository/CalculatorRepository.java @@ -14,6 +14,8 @@ import java.util.*; + + diff --git a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Services/CalculatorService.java b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Services/CalculatorService.java index 548526c..05424a6 100644 --- a/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Services/CalculatorService.java +++ b/app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Services/CalculatorService.java @@ -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()); @@ -75,6 +81,8 @@ old.setNumber1(data.getNumber1()); old.setNumber2(data.getNumber2()); +old.setOperation(data.getOperation()); + old.setResult(data.getResult()); final Calculator test = Repository.save(old); @@ -86,6 +94,8 @@ final Calculator test = Repository.save(old); + + public AppUser getUser() { AppUser user = userService.getLoggedInUser(); return user; diff --git a/app-app-d-d/authsec_mysql/mysql/wf_table/wf_table.sql b/app-app-d-d/authsec_mysql/mysql/wf_table/wf_table.sql index 589661a..182dbc5 100755 --- a/app-app-d-d/authsec_mysql/mysql/wf_table/wf_table.sql +++ b/app-app-d-d/authsec_mysql/mysql/wf_table/wf_table.sql @@ -1,2 +1,2 @@ -CREATE TABLE app-d.Todoapp(id BIGINT NOT NULL AUTO_INCREMENT, description VARCHAR(400), due_date Date, completed bit(1), task_name VARCHAR(400), PRIMARY KEY (id)); +CREATE TABLE app-d.Calculator(id BIGINT NOT NULL AUTO_INCREMENT, result int, number1 int, number2 int, operation VARCHAR(400), PRIMARY KEY (id)); diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Calculator/Calculator.component.html b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Calculator/Calculator.component.html index d2c647f..98bf958 100644 --- a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Calculator/Calculator.component.html +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Calculator/Calculator.component.html @@ -23,15 +23,19 @@
{{error}}
- Number1 + number1 - Number2 + number2 - Result + operation + + + + result @@ -49,6 +53,9 @@ {{user.number2 }} +{{user.operation }} + + {{user.result }} @@ -209,6 +216,8 @@ + +

Update Calculator @@ -218,6 +227,8 @@ + +

{{rowSelected.id}}

@@ -225,18 +236,23 @@
- +
- +
- - + + +
+ +
+ +
@@ -246,6 +262,8 @@ + +

Extension

@@ -296,6 +314,8 @@ + +        
- +
*This field is Required
@@ -318,7 +338,7 @@
- +
*This field is Required
@@ -326,8 +346,16 @@
- - + + +
+ +
+ + +
+
*This field is Required
+
@@ -338,6 +366,8 @@ + + @@ -376,4 +406,6 @@ + + diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Calculator/Calculator.component.ts b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Calculator/Calculator.component.ts index f52a09b..fae70f8 100644 --- a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Calculator/Calculator.component.ts +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Calculator/Calculator.component.ts @@ -68,7 +68,9 @@ number1 : [null,[Validators.required]], number2 : [null,[Validators.required]], -result : [null], +operation : [null], + +result : [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() { + + diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Calculator/Calculator.service.ts b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Calculator/Calculator.service.ts index f31e656..a5cab3d 100644 --- a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Calculator/Calculator.service.ts +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/app-b/Calculator/Calculator.service.ts @@ -35,5 +35,7 @@ export class Calculatorservice{ + + // updateaction } \ No newline at end of file diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts index f2cd1a5..7496e60 100644 --- a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts @@ -1,4 +1,5 @@ + import { TodoComponent } from './BuilderComponents/app-b/Todo/Todo.component'; import { TodoappComponent } from './BuilderComponents/app-b/Todoapp/Todoapp.component'; @@ -282,6 +283,8 @@ const routes: Routes = [ // buildercomponents + + {path:'Todo',component:TodoComponent}, diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts index beef61d..d0f0b94 100644 --- a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts @@ -1,4 +1,5 @@ + import { TodoComponent } from './BuilderComponents/app-b/Todo/Todo.component'; import { TodoappComponent } from './BuilderComponents/app-b/Todoapp/Todoapp.component'; @@ -155,6 +156,8 @@ import { MyworkspaceComponent } from './admin/myworkspace/myworkspace.component' // buildercomponents + + TodoComponent, diff --git a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json index d9ffd31..93831ec 100644 --- a/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json +++ b/app-app-f-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json @@ -226,4 +226,9 @@ "MENU_ACTION_LINK": "Menu Action Link", "STATUS": "Status", "SUB_MENU": "Sub Menu", + "result": "result", + "Calculator": "Calculator", + "number1": "number1", + "number2": "number2", + "operation": "operation" } \ No newline at end of file