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 035ea8b..c49a988 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 @@ -75,6 +75,12 @@ addCustomMenu( "Calculator","Calculator", "Transcations"); addCustomMenu( "Calculator","Calculator", "Transcations"); +addCustomMenu( "Calculator","Calculator", "Transcations"); + + +addCustomMenu( "Calculator","Calculator", "Transcations"); + + addCustomMenu( "Stopwatch","Stopwatch", "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 7e96299..81e15d4 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,8 +22,6 @@ import com.realnet.app-b.Services.CalculatorService ; - - @RequestMapping(value = "/Calculator") @CrossOrigin("*") @RestController @@ -40,8 +38,6 @@ public class CalculatorController { - - @PostMapping("/Calculator") public Calculator Savedata(@RequestBody Calculator data) { Calculator save = Service.Savedata(data) ; @@ -50,8 +46,6 @@ public class CalculatorController { - - System.out.println("data saved..." + save); return save; @@ -102,6 +96,4 @@ 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 552575f..eb55401 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,8 +22,6 @@ import com.realnet.app-b.Services.CalculatorService ; - - @RequestMapping(value = "/token/Calculator") @CrossOrigin("*") @RestController @@ -40,8 +38,6 @@ public class tokenFree_CalculatorController { - - @PostMapping("/Calculator") public Calculator Savedata(@RequestBody Calculator data) { Calculator save = Service.Savedata(data) ; @@ -50,8 +46,6 @@ public class tokenFree_CalculatorController { - - System.out.println("data saved..." + save); return save; @@ -102,6 +96,4 @@ 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 414e615..23cdd45 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,8 +10,6 @@ import com.realnet.WhoColumn.Entity.Extension; - - @Entity @Data public class Calculator extends Extension { @@ -28,9 +26,7 @@ private int number1; private int number2; -private String operation; - -private int result; +private String 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 e6da5bb..0ce09ef 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,8 +14,6 @@ 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 05424a6..548526c 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,8 +18,6 @@ import com.realnet.users.entity1.AppUser; - - import org.springframework.stereotype.Service; @Service @@ -35,8 +33,6 @@ private CalculatorRepository Repository; - - public Calculator Savedata(Calculator data) { @@ -44,8 +40,6 @@ public Calculator Savedata(Calculator data) { - - data.setUpdatedBy(getUser().getUserId()); data.setCreatedBy(getUser().getUserId()); data.setAccountId(getUser().getAccount().getAccount_id()); @@ -81,8 +75,6 @@ old.setNumber1(data.getNumber1()); old.setNumber2(data.getNumber2()); -old.setOperation(data.getOperation()); - old.setResult(data.getResult()); final Calculator test = Repository.save(old); @@ -94,8 +86,6 @@ 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 40454a4..c94e33d 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,4 @@ -CREATE TABLE app-d.Calculator(id BIGINT NOT NULL AUTO_INCREMENT, number2 int, number1 int, operation VARCHAR(400), result int, PRIMARY KEY (id)); +CREATE TABLE app-d.Calculator(id BIGINT NOT NULL AUTO_INCREMENT, number2 int, number1 int, result VARCHAR(400), PRIMARY KEY (id)); + +CREATE TABLE app-d.Calculator(id BIGINT NOT NULL AUTO_INCREMENT, number2 int, number1 int, result 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 8b2045d..d2c647f 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 @@ -31,10 +31,6 @@ - Operation - - - Result @@ -53,9 +49,6 @@ {{user.number2 }} -{{user.operation }} - - {{user.result }} @@ -216,8 +209,6 @@ - -

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

{{rowSelected.id}}

@@ -245,14 +234,9 @@
-
- - -
-
- +
@@ -262,8 +246,6 @@ - -

Extension

@@ -314,8 +296,6 @@ - -        
-
- - -
-
- -
-
*This field is Required
-
+
@@ -366,8 +338,6 @@ - - @@ -406,6 +376,4 @@ - - 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 fae70f8..f52a09b 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,9 +68,7 @@ number1 : [null,[Validators.required]], number2 : [null,[Validators.required]], -operation : [null], - -result : [null,[Validators.required]], +result : [null], @@ -79,8 +77,6 @@ result : [null,[Validators.required]], - - }); // component_button200 // form code start this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => { @@ -109,8 +105,6 @@ result : [null,[Validators.required]], - - } ngOnDestroy(): void { @@ -123,8 +117,6 @@ result : [null,[Validators.required]], - - error; getData() { this.mainService.getAll().subscribe((data) => { @@ -148,8 +140,6 @@ this.product = [...this.product].reverse(); if(this.product.length==0){ - - this.modalEdit = true; } @@ -176,8 +166,6 @@ this.product = [...this.product].reverse(); if(this.product.length==0){ - - //console.log("in update"); console.log("id " + id); console.log(this.rowSelected); @@ -197,8 +185,6 @@ setTimeout(() => { - - }, (error) => { console.log(error); if (error.status >= 200 && error.status <= 299) { @@ -223,8 +209,6 @@ onCreate() { - - this.mainService.create(this.entryForm.value).subscribe( (data) => { console.log(data); @@ -239,8 +223,6 @@ setTimeout(() => { - - }, (error) => { console.log(error); @@ -265,8 +247,6 @@ this.modalAdd = true; this.submitted = false; - - } submitted = false; @@ -284,8 +264,6 @@ onSubmit() { - - // updateaction } @@ -293,5 +271,3 @@ 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 a5cab3d..f31e656 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,7 +35,5 @@ 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 4d3e1db..8247d81 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,5 +1,7 @@ + + import { StopwatchComponent } from './BuilderComponents/app-b/Stopwatch/Stopwatch.component'; @@ -293,6 +295,10 @@ const routes: Routes = [ + + + + {path:'Stopwatch',component:StopwatchComponent}, 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 e298582..ec8143b 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,5 +1,7 @@ + + import { StopwatchComponent } from './BuilderComponents/app-b/Stopwatch/Stopwatch.component'; @@ -166,6 +168,10 @@ import { MyworkspaceComponent } from './admin/myworkspace/myworkspace.component' + + + + StopwatchComponent, 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..86c8bb8 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,8 @@ "MENU_ACTION_LINK": "Menu Action Link", "STATUS": "Status", "SUB_MENU": "Sub Menu", + "Number2": "Number2", + "Number1": "Number1", + "Calculator": "Calculator", + "Result": "Result" } \ No newline at end of file