build_app
This commit is contained in:
		
							parent
							
								
									d121b413d0
								
							
						
					
					
						commit
						bea83db992
					
				| @ -72,6 +72,9 @@ public class BuilderService { | ||||
| addCustomMenu( "Calculator","Calculator",  "Transcations");  | ||||
| 
 | ||||
| 
 | ||||
| addCustomMenu( "Calculator","Calculator",  "Transcations");  | ||||
| 
 | ||||
| 
 | ||||
| addCustomMenu( "Stopwatch","Stopwatch",  "Transcations");  | ||||
| 
 | ||||
| 
 | ||||
|  | ||||
| @ -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 { | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| } | ||||
| @ -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 { | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| } | ||||
| @ -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; | ||||
| 
 | ||||
| 
 | ||||
| } | ||||
|  | ||||
| @ -14,6 +14,8 @@ import java.util.*; | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
|   | ||||
| 
 | ||||
|  | ||||
| @ -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; | ||||
|  | ||||
| @ -1,2 +1,2 @@ | ||||
| CREATE TABLE app-d.Calculator(id BIGINT NOT NULL AUTO_INCREMENT, result VARCHAR(400), number1 int, number2 int,  PRIMARY KEY (id)); | ||||
| CREATE TABLE app-d.Calculator(id BIGINT NOT NULL AUTO_INCREMENT, number2 int, number1 int, operation VARCHAR(400), result int,  PRIMARY KEY (id)); | ||||
| 
 | ||||
|  | ||||
| @ -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]="'number1'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Number1 | ||||
| 						    </ng-container></clr-dg-column> | ||||
| 
 | ||||
| 
 | ||||
| <clr-dg-column [clrDgField]="'number2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> number2 | ||||
| <clr-dg-column [clrDgField]="'number2'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Number2 | ||||
| 						    </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]="'result'"> <ng-container *clrDgHideableColumn="{hidden: false}"> Result | ||||
| 						    </ng-container></clr-dg-column> | ||||
| 
 | ||||
|   | ||||
| @ -49,6 +53,9 @@ | ||||
| <clr-dg-cell>{{user.number2 }}</clr-dg-cell> | ||||
| 
 | ||||
| 
 | ||||
| <clr-dg-cell>{{user.operation }}</clr-dg-cell> | ||||
| 
 | ||||
| 
 | ||||
| <clr-dg-cell>{{user.result }}</clr-dg-cell> | ||||
| 
 | ||||
|   | ||||
| @ -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> | ||||
| <label>Number1</label> | ||||
| 	        <input id="name" class="clr-input"  type="number" [(ngModel)]="rowSelected.number1" name="number1" /> | ||||
| 	      </div> | ||||
| 
 | ||||
| <div class="clr-col-sm-12">        | ||||
| <label>number2</label> | ||||
| <label>Number2</label> | ||||
| 	        <input id="name" class="clr-input"  type="number" [(ngModel)]="rowSelected.number2" name="number2" /> | ||||
| 	      </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>Result</label> | ||||
| 	        <input id="name" class="clr-input"  type="number" [(ngModel)]="rowSelected.result" name="result" /> | ||||
| 	      </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 --> | ||||
|             | ||||
|     <a *ngIf="userrole?.includes('ADMIN')" style="float: right;" href="javascript:void(0)" role="tooltip" aria-haspopup="true" | ||||
| @ -310,7 +330,7 @@ | ||||
|    <div class="clr-row" style="height: fit-content;"> | ||||
| 
 | ||||
| <div class="clr-col-sm-12"> | ||||
|  <label>  number1</label> | ||||
|  <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> | ||||
| @ -318,7 +338,7 @@ | ||||
|  </div> | ||||
| 
 | ||||
| <div class="clr-col-sm-12"> | ||||
|  <label>  number2</label> | ||||
|  <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> | ||||
| @ -326,8 +346,16 @@ | ||||
|  </div> | ||||
| 
 | ||||
| <div class="clr-col-sm-12"> | ||||
|  <label>  result</label> | ||||
|  <input class="clr-input"  type="text"  formControlName="result" />        | ||||
|  <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" />       | ||||
|  <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> | ||||
| 
 | ||||
|   | ||||
| @ -338,6 +366,8 @@ | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
|       <!-- form code start --> | ||||
| @ -376,4 +406,6 @@ | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
|   <!-- htmlpopup --> | ||||
|  | ||||
| @ -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() { | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
|  | ||||
| @ -35,5 +35,7 @@ export class Calculatorservice{ | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| // updateaction
 | ||||
| } | ||||
| @ -1,4 +1,5 @@ | ||||
| 
 | ||||
| 
 | ||||
| import { StopwatchComponent } from './BuilderComponents/app-b/Stopwatch/Stopwatch.component'; | ||||
| 
 | ||||
| 
 | ||||
| @ -290,6 +291,8 @@ const routes: Routes = [ | ||||
|       // buildercomponents
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| {path:'Stopwatch',component:StopwatchComponent}, | ||||
| 
 | ||||
| 
 | ||||
|  | ||||
| @ -1,4 +1,5 @@ | ||||
| 
 | ||||
| 
 | ||||
| import { StopwatchComponent } from './BuilderComponents/app-b/Stopwatch/Stopwatch.component'; | ||||
| 
 | ||||
| 
 | ||||
| @ -163,6 +164,8 @@ import { MyworkspaceComponent } from './admin/myworkspace/myworkspace.component' | ||||
|     // buildercomponents
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
| StopwatchComponent, | ||||
| 
 | ||||
| 
 | ||||
|  | ||||
| @ -226,4 +226,9 @@ | ||||
|   "MENU_ACTION_LINK": "Menu Action Link", | ||||
|   "STATUS": "Status", | ||||
|   "SUB_MENU": "Sub Menu", | ||||
|   "Number2": "Number2", | ||||
|   "Number1": "Number1", | ||||
|   "Calculator": "Calculator", | ||||
|   "Operation": "Operation", | ||||
|   "Result": "Result" | ||||
| } | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user