Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

This commit is contained in:
Peter Maquiran
2021-05-12 10:42:05 +01:00
3 changed files with 7 additions and 7 deletions
+3 -3
View File
@@ -6,19 +6,19 @@
</button>
</div>
<div class="header-title">
<label>Adicionar notas</label>
<label>Adicionar coméntário</label>
</div>
</div>
</ion-header>
<ion-content>
<ion-item lines="none">
<ion-textarea [(ngModel)]="emendMessage" rows="4" cols="20" placeholder="Digite uma nota..."></ion-textarea>
<ion-textarea [(ngModel)]="emendMessage" rows="4" cols="20" placeholder="Adicionar um comentário para execução..."></ion-textarea>
</ion-item>
</ion-content>
<ion-footer>
<div class="buttons width-100">
<button class="btn-delete cursor-pointer" shape="round" (click)="close()">Cancelar</button>
<button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
<button class="btn-ok cursor-pointer" shape="round" (click)="save()">Gravar</button>
</div>
</ion-footer>
@@ -6,19 +6,19 @@
</button>
</div>
<div class="header-title">
<label>Notas</label>
<label>Enviar para revisão</label>
</div>
</div>
</ion-header>
<ion-content>
<ion-item lines="none">
<ion-textarea [(ngModel)]="emendMessage" rows="4" cols="20" placeholder="Digite uma nota..."></ion-textarea>
<ion-textarea [(ngModel)]="emendMessage" rows="4" cols="20" placeholder="Indique o que necessita ser revisto!"></ion-textarea>
</ion-item>
</ion-content>
<ion-footer>
<div class="buttons width-100">
<button class="btn-delete cursor-pointer" shape="round" (click)="close()">Cancelar</button>
<button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
<button class="btn-ok cursor-pointer" shape="round" (click)="save()">Gravar</button>
</div>
</ion-footer>
+1 -1
View File
@@ -58,7 +58,7 @@ export class AuthService {
if( response.RoleID == 100000014) {
response.Profile = 'PR'
} else if(response.RoleID == 100000011) {
response.Profile = 'PR'
response.Profile = 'MDGPR'
}
response.BasicAuthKey = user.BasicAuthKey
this.ValidatedUser = response;