- 
                Notifications
    You must be signed in to change notification settings 
- Fork 1
#3-Time clock find project #54
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
          
     Closed
      
      
    
  
     Closed
                    Changes from 1 commit
      Commits
    
    
            Show all changes
          
          
            11 commits
          
        
        Select commit
          Hold shift + click to select a range
      
      22b7119
              
                added test
              
              
                daros10 e15d20c
              
                Merge branch 'master' of https://github.com/ioet/time-tracker-ui into…
              
              
                daros10 c501044
              
                Update time-clock.component.html
              
              
                daros10 56247f6
              
                #3 serach project in view project
              
              
                daros10 f4b586c
              
                #3 added search in time clock view
              
              
                daros10 de4fbd6
              
                Merge branch 'master' of https://github.com/ioet/time-tracker-ui into…
              
              
                daros10 75b33b3
              
                #3 added comma in modules
              
              
                daros10 ae78b3d
              
                added unit test
              
              
                daros10 e2ac439
              
                #3 find project
              
              
                daros10 01696cf
              
                Merge branch 'TimeClock-find-project-#3' of https://github.com/ioet/t…
              
              
                daros10 7c8ca50
              
                format code indentation based in 2 spaces.
              
              
                daros10 File filter
Filter by extension
Conversations
          Failed to load comments.   
        
        
          
      Loading
        
  Jump to
        
          Jump to file
        
      
      
          Failed to load files.   
        
        
          
      Loading
        
  Diff view
Diff view
       Update time-clock.component.html
    
  - Loading branch information
    
    
      commit c5010442bb2c5e3b7c674bf717ab409ec429a264
    
  
There are no files selected for viewing
        
          
          
            165 changes: 80 additions & 85 deletions
          
          165 
        
  src/app/components/options-sidebar/time-clock/time-clock.component.html
  
  
      
      
   
        
      
      
    
  
    
      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,89 +1,84 @@ | ||
| <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 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> | ||
| </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>{{ 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" | ||
| style="font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif, FontAwesome"> | ||
| </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> | ||
| <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 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> | ||
| <form> | ||
| <div class="form-group"> | ||
| <input type="text" class="form-control" id="formGroupExampleInput" placeholder=" Search project" style="font-family:'Segoe UI', Tahoma, Geneva, Verdana, sans-serif, FontAwesome"> | ||
| </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) && !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> | ||
| </div> | ||
| </div> | ||
| </div> | ||
  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.
Please, fix the indentation, remember that we are using an indentation based in 2 spaces.
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.
done