#3-Time clock find project #54
Prev
Previous commit
format code indentation based in 2 spaces.
- Loading branch information
commit 7c8ca50531b197e258a9c14d896eba4b67851879
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,4 @@ | ||
| <div class="parent"> | ||
| <app-create-activity class="item"></app-create-activity> | ||
| <app-activity-list [activities]="activities" class="item"></app-activity-list> | ||
| </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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,35 @@ | ||
| <div class="card-body"> | ||
| <div class="scroll"> | ||
| <div class="accordion" id="accordionActivities"> | ||
| <div *ngIf="activities?.length > 0; else notShow"> | ||
| <div class="card" *ngFor="let activity of activities; let rowIndex = index"> | ||
| <div class="card-header"> | ||
| <h2 class="mb-0"> | ||
| <a type="button" data-toggle="collapse" [attr.data-target]="'#row'+rowIndex"> | ||
| {{activity.name}} | ||
| </a> | ||
| <div class="btn-group float-right" role="group"> | ||
| <i class="far fa-edit btn btn-link"></i> | ||
| <i class="far fa-trash-alt btn btn-link"></i> | ||
| </div> | ||
| </h2> | ||
| </div> | ||
| <div [id]="'row'+rowIndex" class="collapse" data-parent="#accordionActivities"> | ||
| <div class="card-body"> | ||
| <h5>Description:</h5> | ||
| <p>{{activity.description}}</p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <ng-template #notShow> | ||
| <div class="card"> | ||
| <div class="card-body"> | ||
| <h4 class="card-text">There are no activities.</h4> | ||
| <h5 class="card-text">Please, create one.</h5> | ||
| </div> | ||
| </div> | ||
| </ng-template> | ||
| </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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| <div class="parent"> | ||
| <app-create-project class="item" [projectToEdit]="project" (savedProject)="updateProject($event)" | ||
| (cancelForm)="cancelForm()"> | ||
| </app-create-project> | ||
|
|
||
| <app-project-list class="item" [projects]="projects" (editProject)="editProject($event)" | ||
| (deleteProject)="deleteProject($event)"> | ||
| </app-project-list> | ||
| </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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,3 @@ | ||
| <div class="text-center mt-5"> | ||
| <p>reports works!</p> | ||
| </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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,79 +1,90 @@ | ||
| <div class="text-center mt-5"> | ||
| <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>{{ hour | number: '2.0-2' }}:{{ minute | number: '2.0-2' }}:{{ seconds | number: '2.0-2' }}</strong></p> | ||
| <p *ngIf="isClockIn" class="card-title text-left"><strong>{{ username }}</strong> clocked <strong | ||
| class="text-danger">out</strong> at | ||
| <strong>{{ hour | number: '2.0-2' }}:{{ minute | number: '2.0-2' }}:{{ seconds | number: '2.0-2' }}</strong></p> | ||
| <h6 class="text-left"><strong>Totals</strong></h6> | ||
| <hr> | ||
| <div class="row"> | ||
| <div class="col-4"> | ||
| <h6>Current</h6> | ||
| <h3> | ||
| {{ hourCounterRealTime | number: '2.0-2' }}:{{ minuteCounterRealTime | number: '2.0-2' }}:{{ secondsCounterRealTime | number: '2.0-2' }} | ||
| </h3> | ||
| </div> | ||
| <div class="col-4"> | ||
| <h6>Day</h6> | ||
| <h3>00:00</h3> | ||
| </div> | ||
| <div class="col-4"> | ||
| <h6>Week</h6> | ||
| <h3>00:00</h3> | ||
| </div> | ||
| </div> | ||
| <h6 class="text-left"><strong>Projects</strong></h6> | ||
| <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) && !isHidenForm"> | ||
| <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> | ||
| <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 *ngIf="!showAlertEnterTecnology" #data type="text" (keyup)="enterTechnology(data.value)" | ||
| class="form-control"> | ||
| <input *ngIf="showAlertEnterTecnology" #data type="text" (keyup)="enterTechnology(data.value)" | ||
| class="form-control border-danger"> | ||
| <div> | ||
| <h6 *ngIf="showAlertEnterTecnology" class="text-danger text-left">Technology field is required. Enter this | ||
| field to clock out.</h6> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </form> | ||
| <hr> | ||
| <div class="container"> | ||
| <div class="row"> | ||
| <div class="col text-left" id="optionsContainer"> | ||
| <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" id="clockInOutContainer"> | ||
| <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.
this.isClockIn = true; ???