diff --git a/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java b/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java index 866b396..1b2b8c9 100644 --- a/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java +++ b/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/Builders/Services/BuilderService.java @@ -78,6 +78,12 @@ addCustomMenu( "Stopwatch","Stopwatch", "Transcations"); addCustomMenu( "Stopwatch","Stopwatch", "Transcations"); +addCustomMenu( "Stopwatch","Stopwatch", "Transcations"); + + +addCustomMenu( "Stopwatch","Stopwatch", "Transcations"); + + addCustomMenu( "Stopwatch","Stopwatch", "Transcations"); diff --git a/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Controllers/StopwatchController.java b/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Controllers/StopwatchController.java index 2c578e5..892dc61 100644 --- a/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Controllers/StopwatchController.java +++ b/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Controllers/StopwatchController.java @@ -18,12 +18,6 @@ import com.realnet.stopwatch.Entity.Stopwatch; import com.realnet.stopwatch.Services.StopwatchService ; - - - - - - @RequestMapping(value = "/Stopwatch") @CrossOrigin("*") @RestController @@ -36,22 +30,10 @@ public class StopwatchController { - - - - - - @PostMapping("/Stopwatch") public Stopwatch Savedata(@RequestBody Stopwatch data) { Stopwatch save = Service.Savedata(data) ; - - - - - - System.out.println("data saved..." + save); return save; @@ -98,10 +80,4 @@ public class StopwatchController { - - - - - - } \ No newline at end of file diff --git a/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Controllers/tokenFree_StopwatchController.java b/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Controllers/tokenFree_StopwatchController.java index ce87920..d94d6e4 100644 --- a/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Controllers/tokenFree_StopwatchController.java +++ b/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Controllers/tokenFree_StopwatchController.java @@ -18,12 +18,6 @@ import com.realnet.stopwatch.Entity.Stopwatch; import com.realnet.stopwatch.Services.StopwatchService ; - - - - - - @RequestMapping(value = "/token/Stopwatch") @CrossOrigin("*") @RestController @@ -36,22 +30,10 @@ public class tokenFree_StopwatchController { - - - - - - @PostMapping("/Stopwatch") public Stopwatch Savedata(@RequestBody Stopwatch data) { Stopwatch save = Service.Savedata(data) ; - - - - - - System.out.println("data saved..." + save); return save; @@ -98,10 +80,4 @@ public class tokenFree_StopwatchController { - - - - - - } \ No newline at end of file diff --git a/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Entity/Stopwatch.java b/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Entity/Stopwatch.java index cfd5117..7639756 100644 --- a/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Entity/Stopwatch.java +++ b/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Entity/Stopwatch.java @@ -6,12 +6,6 @@ import com.realnet.WhoColumn.Entity.Extension; import java.util.*; - - - - - - @Entity @Data public class Stopwatch extends Extension { @@ -24,13 +18,7 @@ import com.realnet.WhoColumn.Entity.Extension; @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer id; -private String starttime; - -private String endtime; - -private int duration; - -private String status; +private int elapsedtime; } diff --git a/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Repository/StopwatchRepository.java b/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Repository/StopwatchRepository.java index a0a710d..5870044 100644 --- a/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Repository/StopwatchRepository.java +++ b/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Repository/StopwatchRepository.java @@ -10,12 +10,6 @@ import org.springframework.stereotype.Repository; import java.util.*; - - - - - - diff --git a/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Services/StopwatchService.java b/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Services/StopwatchService.java index 997fa55..47c79cd 100644 --- a/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Services/StopwatchService.java +++ b/stop_watch_app-stop_watch_app-b-b/authsec_springboot/backend/src/main/java/com/realnet/stopwatch/Services/StopwatchService.java @@ -14,12 +14,6 @@ import com.realnet.users.service1.AppUserServiceImpl; import com.realnet.users.entity1.AppUser; - - - - - - import org.springframework.stereotype.Service; @Service @@ -31,21 +25,9 @@ private StopwatchRepository Repository; @Autowired private RealmService realmService; - - - - - - public Stopwatch Savedata(Stopwatch data) { - - - - - - data.setUpdatedBy(getUser().getUserId()); data.setCreatedBy(getUser().getUserId()); data.setAccountId(getUser().getAccount().getAccount_id()); @@ -77,25 +59,13 @@ public Stopwatch getdetailsbyId(Integer id) { public Stopwatch update(Stopwatch data,Integer id) { Stopwatch old = Repository.findById(id).get(); -old.setStarttime(data.getStarttime()); - -old.setEndtime(data.getEndtime()); - -old.setDuration(data.getDuration()); - -old.setStatus(data.getStatus()); +old.setElapsedtime(data.getElapsedtime()); final Stopwatch test = Repository.save(old); data.setUpdatedBy(getUser().getUserId()); return test;} - - - - - - public AppUser getUser() { AppUser user = userService.getLoggedInUser(); return user; diff --git a/stop_watch_app-stop_watch_app-d-d/authsec_mysql/mysql/wf_table/wf_table.sql b/stop_watch_app-stop_watch_app-d-d/authsec_mysql/mysql/wf_table/wf_table.sql index a38ba5e..eb044da 100755 --- a/stop_watch_app-stop_watch_app-d-d/authsec_mysql/mysql/wf_table/wf_table.sql +++ b/stop_watch_app-stop_watch_app-d-d/authsec_mysql/mysql/wf_table/wf_table.sql @@ -1,2 +1,4 @@ CREATE TABLE stop_watch_app-d.Stopwatch(id BIGINT NOT NULL AUTO_INCREMENT, duration int, starttime Date, endtime Date, status VARCHAR(400), PRIMARY KEY (id)); +CREATE TABLE stop_watch_app-d.Stopwatch(id BIGINT NOT NULL AUTO_INCREMENT, elapsedtime int, PRIMARY KEY (id)); + diff --git a/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stopwatch/Stopwatch/Stopwatch.component.html b/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stopwatch/Stopwatch/Stopwatch.component.html index f96bd77..d23f344 100644 --- a/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stopwatch/Stopwatch/Stopwatch.component.html +++ b/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stopwatch/Stopwatch/Stopwatch.component.html @@ -1,10 +1,10 @@
    -
  1. Stopwatch
    2. +
  2. StopWatch
-

Stopwatch

+

StopWatch

- - - - - - -

Update Stopwatch +

Update StopWatch - - - - - -

{{rowSelected.id}}

@@ -236,34 +203,13 @@
- - -
- -
- - -
- -
- - -
- -
- - + +
- - - - - -

Extension

@@ -307,13 +253,7 @@ -

Add Stopwatch - - - - - - +

Add StopWatch @@ -330,38 +270,17 @@
- - -
- -
- - -
- -
- - -
-
*This field is Required
+ + +
+
*This field is Required
-
- - -
-
- - - - - - @@ -396,10 +315,4 @@ - - - - - - diff --git a/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stopwatch/Stopwatch/Stopwatch.component.ts b/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stopwatch/Stopwatch/Stopwatch.component.ts index dd0c5a2..44d9ae2 100644 --- a/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stopwatch/Stopwatch/Stopwatch.component.ts +++ b/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stopwatch/Stopwatch/Stopwatch.component.ts @@ -64,23 +64,11 @@ private userInfoService:UserInfoService, this.userrole=this.userInfoService.getRoles(); this.getData(); this.entryForm = this._fb.group({ -starttime : [null], - -endtime : [null], - -duration : [null,[Validators.required]], - -status : [null], +elapsedtime : [null,[Validators.required]], - - - - - - }); // component_button200 // form code start this.extensionService.getJsonObjectsByFormCodeList(this.formcode).subscribe(data => { @@ -105,12 +93,6 @@ status : [null], // form code end - - - - - - } ngOnDestroy(): void { @@ -119,12 +101,6 @@ status : [null], } } - - - - - - error; getData() { this.mainService.getAll().subscribe((data) => { @@ -144,12 +120,6 @@ this.product = [...this.product].reverse(); if(this.product.length==0){ this.rowSelected = row; - - - - - - this.modalEdit = true; } @@ -172,12 +142,6 @@ this.product = [...this.product].reverse(); if(this.product.length==0){ this.modalEdit = false; - - - - - - //console.log("in update"); console.log("id " + id); console.log(this.rowSelected); @@ -193,12 +157,6 @@ setTimeout(() => { }, 500); - - - - - - }, (error) => { console.log(error); if (error.status >= 200 && error.status <= 299) { @@ -219,12 +177,6 @@ onCreate() { this.modalAdd=false; - - - - - - this.mainService.create(this.entryForm.value).subscribe( (data) => { console.log(data); @@ -235,12 +187,6 @@ setTimeout(() => { this.ngOnInit(); }, 500); - - - - - - }, (error) => { console.log(error); @@ -261,12 +207,6 @@ setTimeout(() => { goToAdd(row) { this.modalAdd = true; this.submitted = false; - - - - - - } submitted = false; @@ -280,18 +220,6 @@ onSubmit() { } - - - - - - // updateaction } - - - - - - diff --git a/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stopwatch/Stopwatch/Stopwatch.service.ts b/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stopwatch/Stopwatch/Stopwatch.service.ts index 2df483f..7ad97b3 100644 --- a/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stopwatch/Stopwatch/Stopwatch.service.ts +++ b/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/BuilderComponents/stopwatch/Stopwatch/Stopwatch.service.ts @@ -31,11 +31,5 @@ export class Stopwatchservice{ } - - - - - - // updateaction } \ No newline at end of file diff --git a/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts b/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts index d44b416..45acc22 100644 --- a/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts +++ b/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main-routing.module.ts @@ -1,6 +1,8 @@ + + import { StopwatchComponent } from './BuilderComponents/stopwatch/Stopwatch/Stopwatch.component'; import { SequencegenaratorComponent } from './fnd/sequencegenarator/sequencegenarator.component'; @@ -270,6 +272,10 @@ const routes: Routes = [ + + + + {path:'Stopwatch',component:StopwatchComponent}, diff --git a/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts b/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts index 4b064e3..1659fcb 100644 --- a/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts +++ b/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/app/modules/main/main.module.ts @@ -1,6 +1,8 @@ + + import { StopwatchComponent } from './BuilderComponents/stopwatch/Stopwatch/Stopwatch.component'; @@ -143,6 +145,10 @@ import { MyworkspaceComponent } from './admin/myworkspace/myworkspace.component' + + + + StopwatchComponent, diff --git a/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json b/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json index 8994a97..0356655 100644 --- a/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json +++ b/stop_watch_app-stop_watch_app-f-f/authsec_angular/frontend/angular-clarity-master/src/assets/i18n/en.json @@ -230,5 +230,6 @@ "Stopwatch": "Stopwatch", "startTime": "startTime", "endTime": "endTime", - "status": "status" + "status": "status", + "elapsedTime": "elapsedTime" } \ No newline at end of file