This commit is contained in:
Peter Maquiran
2021-08-20 18:02:50 +01:00
parent 270a31e653
commit 2cb79e2c48
4 changed files with 20 additions and 18 deletions
@@ -2,7 +2,6 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { ActivatedRoute, NavigationEnd, NavigationError, NavigationExtras, NavigationStart, Router } from '@angular/router';
import { DailyWorkTask } from '../../../models/dailyworktask.model';
import { ProcessesService } from 'src/app/services/processes.service';
import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
@Component({
selector: 'app-diplomas',
@@ -12,19 +11,19 @@ import { removeDuplicate } from 'src/plugin/removeDuplicate.js'
export class DiplomasPage implements OnInit, OnDestroy {
list:DailyWorkTask[] = [];
diplomasList:DailyWorkTask[] = [];
diplomasAssinadoList:DailyWorkTask[] = [];
showLoader: boolean;
totalDocs:any;
serialNumber:string;
diplomasAssinadoList:DailyWorkTask[] = [];
showLoader: boolean;
totalDocs:any;
serialNumber:string;
segment:string;
segment:string;
skeletonLoader = true
skeletonLoader = true
constructor(
private processes:ProcessesService,
private router: Router,
private activatedRoute: ActivatedRoute,
constructor(
private processes:ProcessesService,
private router: Router,
private activatedRoute: ActivatedRoute,
) {
this.diplomasList = [];
}
+2 -2
View File
@@ -33,7 +33,7 @@
</div>
</div>
<div class="main-content height-100" *ngIf="setPin || hasSession && loginPreference == 'pin' ">
<!-- <div class="main-content height-100" *ngIf="setPin || hasSession && loginPreference == 'pin' ">
<div class=" align-center justify-center">
<div class="div-top-header">
@@ -80,7 +80,7 @@
</div>
</div>
</div>
</div> -->
</div>
+8 -4
View File
@@ -117,7 +117,7 @@ export class LoginPage implements OnInit {
async Login() {
if (this.validateUsername()) {
if(this.validatePassword()){
if(this.validatePassword()) {
this.userattempt = {
username: this.username,
@@ -134,10 +134,14 @@ export class LoginPage implements OnInit {
this.hasPin = false
this.setPin = true
if(!this.hasPin || this.hasPin) {
} else {
// if(!this.hasPin || this.hasPin) {
// } else {
// this.router.navigate(['/home/events']);
// }
this.code = ['1','1','1','1']
this.storePin()
this.router.navigate(['/home/events']);
}
}
}
else {
-1
View File
@@ -1,6 +1,5 @@
import { Injectable } from '@angular/core';
import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
import { DailyWorkTask } from '../models/dailyworktask.model';
import { AuthService } from '../services/auth.service';
import { User } from '../models/user.model';
import { environment } from 'src/environments/environment';