Time entries section #33
Fix id type to string
- Loading branch information
commit ed3eaf04eb54dec3a057cc9ff0ea4607fa580232
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,84 +1,91 @@ | ||
| <div class="text-center mt-3"> | ||
|
|
||
| <div *ngIf="showAlertEnterTecnology" class="alert alert-danger" role="alert"> | ||
| Field technology is requiered. Enter this field for clock out. | ||
| </div> | ||
|
|
||
| <div class="card"> | ||
| <div class="card-header"> | ||
| <div class="row"> | ||
| <div class="col-2 text-left"> | ||
| <strong>Time clock</strong> | ||
| </div> | ||
| <div class="col-10 text-right"> | ||
| <i class="far fa-question-circle"></i> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="card-body"> | ||
| <p *ngIf="!isClockIn" class="card-title text-left"><strong>{{ username }}</strong> clocked <strong | ||
| class="text-success">in</strong> at <strong>{{ clockInUsername }}</strong></p> | ||
| <p *ngIf="isClockIn" class="card-title text-left"><strong>{{ username }}</strong> clocked <strong | ||
| class="text-danger">out</strong> at <strong>{{ clockOutUsername }}</strong></p> | ||
| <h6 class="text-left"><strong>Totals</strong></h6> | ||
| <hr> | ||
| <div class="row"> | ||
| <div class="col-4"> | ||
| <h6>Current</h6> | ||
| <h3>{{ hour | number: '2.0-2' }}:{{ minute | number: '2.0-2' }}:{{ seconds | number: '2.0-2' }}</h3> | ||
| </div> | ||
| <div class="col-4"> | ||
| <h6>Day</h6> | ||
| <h3>4:22</h3> | ||
| </div> | ||
| <div class="col-4"> | ||
| <h6>Week</h6> | ||
| <h3>14:00</h3> | ||
| </div> | ||
| </div> | ||
| <h6 class="text-left"><strong>Projects</strong></h6> | ||
| <form> | ||
| <div class="form-group"> | ||
| <input type="text" class="form-control" id="formGroupExampleInput" placeholder=" Search project" | ||
|
There was a problem hiding this comment. This component should be drop-down not a input |
||
| style="font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif, FontAwesome"> | ||
|
There was a problem hiding this comment. why are we defining all these style inline? should not we create a class? |
||
| </div> | ||
| </form> | ||
| <p class="text-left"><i class="fas fa-folder"></i><strong> Top</strong></p> | ||
| <ul class="list-group"> | ||
| <app-project-list-hover [projects]="projects" (showFields)="setShowFields($event)"></app-project-list-hover> | ||
| </ul> | ||
| <br> | ||
| <form *ngIf="!isClockIn || showFields"> | ||
| <div class="form-group row"> | ||
| <label for="inputActivity" class="col-sm-2 col-form-label text-center"><strong>Activity</strong></label> | ||
| <div class="col-sm-10"> | ||
| <input type="text" class="form-control"> | ||
| </div> | ||
| </div> | ||
| <div class="form-group row"> | ||
| <label for="inputJiraTicket" class="col-sm-2 col-form-label text-center"><strong>Jira Ticket</strong></label> | ||
|
There was a problem hiding this comment. I think all of these styles are just intended to make the screen look exactly the same as time-sheets. We need to make it look better not the same :) |
||
| <div class="col-sm-10"> | ||
| <input type="text" class="form-control"> | ||
| </div> | ||
| </div> | ||
| <div class="form-group row"> | ||
| <label for="inputTechnology" class="col-sm-2 col-form-label text-center"><strong>Technology</strong></label> | ||
| <div class="col-sm-10"> | ||
| <input #data type="text" (keyup)="enterTechnology(data.value)" class="form-control"> | ||
| </div> | ||
| </div> | ||
| </form> | ||
| <hr> | ||
| <div class="container"> | ||
| <div class="row"> | ||
| <div class="col text-left"> | ||
| <button class="btn btn-light btn-sm dropdown-toggle" type="button" data-toggle="dropdown" | ||
| aria-haspopup="true" aria-expanded="false"> | ||
| Options | ||
| </button> | ||
| </div> | ||
| <div class="col text-right"> | ||
| <button *ngIf="isClockIn" class="btn btn-success btn-sm" type="button" (click)="employeClockIn()">Clock | ||
| In</button> | ||
| <button *ngIf="!isClockIn" class="btn btn-danger btn-sm" type="button" (click)="employeClockOut()">Clock | ||
| Out</button> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
typo: required?