build_app

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

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 {
 
 
 
-
-
 }

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 {
 
 
 
-
-
 }

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 String  result;
-
-private int result;
 
 
 }

app-app-b-b/authsec_springboot/backend/src/main/java/com/realnet/app-b/Repository/CalculatorRepository.java

@@ -14,8 +14,6 @@ import java.util.*;
 
 
 
-
-
 
  
 

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;

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

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 @@
 						    </ng-container></clr-dg-column>
 
 
-<clr-dg-column [clrDgField]="'operation'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Operation
-						    </ng-container></clr-dg-column>
-
-
 <clr-dg-column [clrDgField]="'result'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Result
 						    </ng-container></clr-dg-column>
 
@@ -53,9 +49,6 @@
 <clr-dg-cell>{{user.number2 }}</clr-dg-cell>
 
 
-<clr-dg-cell>{{user.operation }}</clr-dg-cell>
-
-
 <clr-dg-cell>{{user.result }}</clr-dg-cell>
 
  
@@ -216,8 +209,6 @@
 
 
 
-
-
 <!-- //		EDIT DATA......... -->
 <clr-modal [(clrModalOpen)]="modalEdit" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
   <h3 class="modal-title">Update Calculator
@@ -227,8 +218,6 @@
 
 
 
-
-
 </h3>
   <div class="modal-body" *ngIf="rowSelected.id">
     <h2 class="heading">{{rowSelected.id}}</h2>
@@ -245,14 +234,9 @@
 	        <input id="name" class="clr-input"  type="number" [(ngModel)]="rowSelected.number2" name="number2" />
 	      </div>
 
-<div class="clr-col-sm-12">       
-<label>Operation</label>
-	        <input class="clr-input"  type="text" [(ngModel)]="rowSelected.operation" name="operation" />
-	      </div>
-
 <div class="clr-col-sm-12">       
 <label>Result</label>
-	        <input id="name" class="clr-input"  type="number" [(ngModel)]="rowSelected.result" name="result" />
+	        <input class="clr-input"  type="text" [(ngModel)]="rowSelected.result" name="result" />
 	      </div>
 
   </div> 
@@ -262,8 +246,6 @@
 
 
 
-
-
 <!-- form code start -->
   <div *ngIf="checkFormCode">
     <h4 style="font-weight: 300;display: inline;">Extension</h4>
@@ -314,8 +296,6 @@
 
 
 
-
-
   <!-- aeroplane icon -->
     &nbsp; &nbsp; &nbsp; &nbsp;
     <a *ngIf="userrole?.includes('ADMIN')" style="float: right;" href="javascript:void(0)" role="tooltip" aria-haspopup="true"
@@ -345,17 +325,9 @@
 </div>  
  </div>
 
-<div class="clr-col-sm-12">
- <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="number"  formControlName="result" />      
+ <input class="clr-input"  type="text"  formControlName="result" />       
- <div *ngIf="submitted && entryForm.controls.result.errors" class="error_mess">
-  <div *ngIf="submitted && entryForm.controls.result.errors.required" class="error_mess">*This field is Required</div>
-</div>  
  </div>
 
  
@@ -366,8 +338,6 @@
 
 
 
-
-
 
 
       <!-- form code start -->
@@ -406,6 +376,4 @@
 
 
 
-
-
   <!-- htmlpopup -->

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],
-
-result : [null,[Validators.required]],
 
 
  
@@ -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() {
 
 
 
-
-

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
 }

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

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,
 
 

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"
 }