build_app
This commit is contained in:
parent
1b65fcc6a0
commit
67fc8da912
@ -75,6 +75,9 @@ addCustomMenu( "Stopwatch","Stopwatch", "Transcations");
|
|||||||
addCustomMenu( "Stopwatch","Stopwatch", "Transcations");
|
addCustomMenu( "Stopwatch","Stopwatch", "Transcations");
|
||||||
|
|
||||||
|
|
||||||
|
addCustomMenu( "Stopwatch","Stopwatch", "Transcations");
|
||||||
|
|
||||||
|
|
||||||
addCustomMenu( "Stopwatch","Stopwatch", "Transcations");
|
addCustomMenu( "Stopwatch","Stopwatch", "Transcations");
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -24,13 +24,13 @@ import com.realnet.WhoColumn.Entity.Extension;
|
|||||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||||
private Integer id;
|
private Integer id;
|
||||||
|
|
||||||
private int hours;
|
private String starttime;
|
||||||
|
|
||||||
private int minutes;
|
private String endtime;
|
||||||
|
|
||||||
private int seconds;
|
private int duration;
|
||||||
|
|
||||||
private int milliseconds;
|
private String status;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -77,13 +77,13 @@ public Stopwatch getdetailsbyId(Integer id) {
|
|||||||
|
|
||||||
public Stopwatch update(Stopwatch data,Integer id) {
|
public Stopwatch update(Stopwatch data,Integer id) {
|
||||||
Stopwatch old = Repository.findById(id).get();
|
Stopwatch old = Repository.findById(id).get();
|
||||||
old.setHours(data.getHours());
|
old.setStarttime(data.getStarttime());
|
||||||
|
|
||||||
old.setMinutes(data.getMinutes());
|
old.setEndtime(data.getEndtime());
|
||||||
|
|
||||||
old.setSeconds(data.getSeconds());
|
old.setDuration(data.getDuration());
|
||||||
|
|
||||||
old.setMilliseconds(data.getMilliseconds());
|
old.setStatus(data.getStatus());
|
||||||
|
|
||||||
final Stopwatch test = Repository.save(old);
|
final Stopwatch test = Repository.save(old);
|
||||||
data.setUpdatedBy(getUser().getUserId());
|
data.setUpdatedBy(getUser().getUserId());
|
||||||
|
|||||||
@ -1,6 +1,2 @@
|
|||||||
CREATE TABLE stop_watch_app-d.Stopwatch(id BIGINT NOT NULL AUTO_INCREMENT, currenttime int, laptime VARCHAR(400), isrunning bit(1), PRIMARY KEY (id));
|
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, duration int, starttime Date, stoptime Date, status VARCHAR(400), PRIMARY KEY (id));
|
|
||||||
|
|
||||||
CREATE TABLE stop_watch_app-d.Stopwatch(id BIGINT NOT NULL AUTO_INCREMENT, milliseconds int, hours int, seconds int, minutes int, PRIMARY KEY (id));
|
|
||||||
|
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
<ol class="breadcrumb breadcrumb-arrow font-trirong">
|
<ol class="breadcrumb breadcrumb-arrow font-trirong">
|
||||||
<li><a href="javascript://"> StopWatch</a></li>
|
<li><a href="javascript://"> Stopwatch</a></li>
|
||||||
</ol>
|
</ol>
|
||||||
<div class="dg-wrapper">
|
<div class="dg-wrapper">
|
||||||
<div class="clr-row">
|
<div class="clr-row">
|
||||||
<div class="clr-col-8">
|
<div class="clr-col-8">
|
||||||
<h3>StopWatch </h3>
|
<h3>Stopwatch </h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="clr-col-4" style="text-align: right;">
|
<div class="clr-col-4" style="text-align: right;">
|
||||||
<button *ngIf="cardButton" id="add" class="btn btn-primary btn-icon" (click)="changeView()" >
|
<button *ngIf="cardButton" id="add" class="btn btn-primary btn-icon" (click)="changeView()" >
|
||||||
@ -23,19 +23,19 @@
|
|||||||
<div *ngIf="error;else loadingSpinner">{{error}}</div>
|
<div *ngIf="error;else loadingSpinner">{{error}}</div>
|
||||||
</clr-dg-placeholder>
|
</clr-dg-placeholder>
|
||||||
|
|
||||||
<clr-dg-column [clrDgField]="'hours'"> <ng-container *clrDgHideableColumn="{hidden: false}"> hours
|
<clr-dg-column [clrDgField]="'starttime'"> <ng-container *clrDgHideableColumn="{hidden: false}"> startTime
|
||||||
</ng-container></clr-dg-column>
|
</ng-container></clr-dg-column>
|
||||||
|
|
||||||
|
|
||||||
<clr-dg-column [clrDgField]="'minutes'"> <ng-container *clrDgHideableColumn="{hidden: false}"> minutes
|
<clr-dg-column [clrDgField]="'endtime'"> <ng-container *clrDgHideableColumn="{hidden: false}"> endTime
|
||||||
</ng-container></clr-dg-column>
|
</ng-container></clr-dg-column>
|
||||||
|
|
||||||
|
|
||||||
<clr-dg-column [clrDgField]="'seconds'"> <ng-container *clrDgHideableColumn="{hidden: false}"> seconds
|
<clr-dg-column [clrDgField]="'duration'"> <ng-container *clrDgHideableColumn="{hidden: false}"> duration
|
||||||
</ng-container></clr-dg-column>
|
</ng-container></clr-dg-column>
|
||||||
|
|
||||||
|
|
||||||
<clr-dg-column [clrDgField]="'milliseconds'"> <ng-container *clrDgHideableColumn="{hidden: false}"> milliseconds
|
<clr-dg-column [clrDgField]="'status'"> <ng-container *clrDgHideableColumn="{hidden: false}"> status
|
||||||
</ng-container></clr-dg-column>
|
</ng-container></clr-dg-column>
|
||||||
|
|
||||||
|
|
||||||
@ -47,16 +47,16 @@
|
|||||||
|
|
||||||
<clr-dg-row *clrDgItems="let user of product" [clrDgItem]="user">
|
<clr-dg-row *clrDgItems="let user of product" [clrDgItem]="user">
|
||||||
|
|
||||||
<clr-dg-cell>{{user.hours }}</clr-dg-cell>
|
<clr-dg-cell>{{user.starttime }}</clr-dg-cell>
|
||||||
|
|
||||||
|
|
||||||
<clr-dg-cell>{{user.minutes }}</clr-dg-cell>
|
<clr-dg-cell>{{user.endtime }}</clr-dg-cell>
|
||||||
|
|
||||||
|
|
||||||
<clr-dg-cell>{{user.seconds }}</clr-dg-cell>
|
<clr-dg-cell>{{user.duration }}</clr-dg-cell>
|
||||||
|
|
||||||
|
|
||||||
<clr-dg-cell>{{user.milliseconds }}</clr-dg-cell>
|
<clr-dg-cell>{{user.status }}</clr-dg-cell>
|
||||||
|
|
||||||
|
|
||||||
<!-- who column -->
|
<!-- who column -->
|
||||||
@ -220,7 +220,7 @@
|
|||||||
|
|
||||||
<!-- // EDIT DATA......... -->
|
<!-- // EDIT DATA......... -->
|
||||||
<clr-modal [(clrModalOpen)]="modalEdit" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
|
<clr-modal [(clrModalOpen)]="modalEdit" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
|
||||||
<h3 class="modal-title">Update StopWatch
|
<h3 class="modal-title">Update Stopwatch
|
||||||
<!--update button -->
|
<!--update button -->
|
||||||
|
|
||||||
|
|
||||||
@ -236,23 +236,23 @@
|
|||||||
<form >
|
<form >
|
||||||
<div class="clr-row">
|
<div class="clr-row">
|
||||||
<div class="clr-col-sm-12">
|
<div class="clr-col-sm-12">
|
||||||
<label>hours</label>
|
<label>startTime</label>
|
||||||
<input id="name" class="clr-input" type="number" [(ngModel)]="rowSelected.hours" name="hours" />
|
<input id="name" class="clr-input" type="date" [(ngModel)]="rowSelected.starttime" name="starttime" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="clr-col-sm-12">
|
<div class="clr-col-sm-12">
|
||||||
<label>minutes</label>
|
<label>endTime</label>
|
||||||
<input id="name" class="clr-input" type="number" [(ngModel)]="rowSelected.minutes" name="minutes" />
|
<input id="name" class="clr-input" type="date" [(ngModel)]="rowSelected.endtime" name="endtime" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="clr-col-sm-12">
|
<div class="clr-col-sm-12">
|
||||||
<label>seconds</label>
|
<label>duration</label>
|
||||||
<input id="name" class="clr-input" type="number" [(ngModel)]="rowSelected.seconds" name="seconds" />
|
<input id="name" class="clr-input" type="number" [(ngModel)]="rowSelected.duration" name="duration" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="clr-col-sm-12">
|
<div class="clr-col-sm-12">
|
||||||
<label>milliseconds</label>
|
<label>status</label>
|
||||||
<input id="name" class="clr-input" type="number" [(ngModel)]="rowSelected.milliseconds" name="milliseconds" />
|
<input class="clr-input" type="text" [(ngModel)]="rowSelected.status" name="status" />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
@ -307,7 +307,7 @@
|
|||||||
</clr-modal>
|
</clr-modal>
|
||||||
<!-- ADD FORM ..... -->
|
<!-- ADD FORM ..... -->
|
||||||
<clr-modal [(clrModalOpen)]="modalAdd" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
|
<clr-modal [(clrModalOpen)]="modalAdd" [clrModalSize]="'lg'" [clrModalStaticBackdrop]="true">
|
||||||
<h3 class="modal-title">Add StopWatch
|
<h3 class="modal-title">Add Stopwatch
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@ -330,35 +330,26 @@
|
|||||||
<div class="clr-row" style="height: fit-content;">
|
<div class="clr-row" style="height: fit-content;">
|
||||||
|
|
||||||
<div class="clr-col-sm-12">
|
<div class="clr-col-sm-12">
|
||||||
<label> hours</label>
|
<label> startTime</label>
|
||||||
<input class="clr-input" type="number" formControlName="hours" />
|
<input class="clr-input" type="date" formControlName="starttime" />
|
||||||
<div *ngIf="submitted && entryForm.controls.hours.errors" class="error_mess">
|
</div>
|
||||||
<div *ngIf="submitted && entryForm.controls.hours.errors.required" class="error_mess">*This field is Required</div>
|
|
||||||
|
<div class="clr-col-sm-12">
|
||||||
|
<label> endTime</label>
|
||||||
|
<input class="clr-input" type="date" formControlName="endtime" />
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="clr-col-sm-12">
|
||||||
|
<label> duration</label>
|
||||||
|
<input class="clr-input" type="number" formControlName="duration" />
|
||||||
|
<div *ngIf="submitted && entryForm.controls.duration.errors" class="error_mess">
|
||||||
|
<div *ngIf="submitted && entryForm.controls.duration.errors.required" class="error_mess">*This field is Required</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="clr-col-sm-12">
|
<div class="clr-col-sm-12">
|
||||||
<label> minutes</label>
|
<label> status</label>
|
||||||
<input class="clr-input" type="number" formControlName="minutes" />
|
<input class="clr-input" type="text" formControlName="status" />
|
||||||
<div *ngIf="submitted && entryForm.controls.minutes.errors" class="error_mess">
|
|
||||||
<div *ngIf="submitted && entryForm.controls.minutes.errors.required" class="error_mess">*This field is Required</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="clr-col-sm-12">
|
|
||||||
<label> seconds</label>
|
|
||||||
<input class="clr-input" type="number" formControlName="seconds" />
|
|
||||||
<div *ngIf="submitted && entryForm.controls.seconds.errors" class="error_mess">
|
|
||||||
<div *ngIf="submitted && entryForm.controls.seconds.errors.required" class="error_mess">*This field is Required</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="clr-col-sm-12">
|
|
||||||
<label> milliseconds</label>
|
|
||||||
<input class="clr-input" type="number" formControlName="milliseconds" />
|
|
||||||
<div *ngIf="submitted && entryForm.controls.milliseconds.errors" class="error_mess">
|
|
||||||
<div *ngIf="submitted && entryForm.controls.milliseconds.errors.required" class="error_mess">*This field is Required</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -64,13 +64,13 @@ private userInfoService:UserInfoService,
|
|||||||
this.userrole=this.userInfoService.getRoles();
|
this.userrole=this.userInfoService.getRoles();
|
||||||
this.getData();
|
this.getData();
|
||||||
this.entryForm = this._fb.group({
|
this.entryForm = this._fb.group({
|
||||||
hours : [null,[Validators.required]],
|
starttime : [null],
|
||||||
|
|
||||||
minutes : [null,[Validators.required]],
|
endtime : [null],
|
||||||
|
|
||||||
seconds : [null,[Validators.required]],
|
duration : [null,[Validators.required]],
|
||||||
|
|
||||||
milliseconds : [null,[Validators.required]],
|
status : [null],
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
import { StopwatchComponent } from './BuilderComponents/stopwatch/Stopwatch/Stopwatch.component';
|
import { StopwatchComponent } from './BuilderComponents/stopwatch/Stopwatch/Stopwatch.component';
|
||||||
|
|
||||||
import { SequencegenaratorComponent } from './fnd/sequencegenarator/sequencegenarator.component';
|
import { SequencegenaratorComponent } from './fnd/sequencegenarator/sequencegenarator.component';
|
||||||
@ -267,6 +268,8 @@ const routes: Routes = [
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
{path:'Stopwatch',component:StopwatchComponent},
|
{path:'Stopwatch',component:StopwatchComponent},
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -1,5 +1,6 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
import { StopwatchComponent } from './BuilderComponents/stopwatch/Stopwatch/Stopwatch.component';
|
import { StopwatchComponent } from './BuilderComponents/stopwatch/Stopwatch/Stopwatch.component';
|
||||||
|
|
||||||
|
|
||||||
@ -140,6 +141,8 @@ import { MyworkspaceComponent } from './admin/myworkspace/myworkspace.component'
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
StopwatchComponent,
|
StopwatchComponent,
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -226,16 +226,9 @@
|
|||||||
"MENU_ACTION_LINK": "Menu Action Link",
|
"MENU_ACTION_LINK": "Menu Action Link",
|
||||||
"STATUS": "Status",
|
"STATUS": "Status",
|
||||||
"SUB_MENU": "Sub Menu",
|
"SUB_MENU": "Sub Menu",
|
||||||
"currentTime": "currentTime",
|
|
||||||
"duration": "duration",
|
"duration": "duration",
|
||||||
"lapTime": "lapTime",
|
|
||||||
"milliseconds": "milliseconds",
|
|
||||||
"hours": "hours",
|
|
||||||
"seconds": "seconds",
|
|
||||||
"isRunning": "isRunning",
|
|
||||||
"minutes": "minutes",
|
|
||||||
"Stopwatch": "Stopwatch",
|
"Stopwatch": "Stopwatch",
|
||||||
"startTime": "startTime",
|
"startTime": "startTime",
|
||||||
"stopTime": "stopTime",
|
"endTime": "endTime",
|
||||||
"status": "status"
|
"status": "status"
|
||||||
}
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user