peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 21:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-07-26 20:46:14 +01:00
parent 491424768e
commit 6d731aea1c
8 changed files with 59 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/add-note/add-note.page.html
+19 -15
View File
@@ -7,23 +7,27 @@
</ion-header>
<ion-content>
<div class="main-content d-flex height-100">
<div class="ion-input-class-no-height">
<ion-textarea [(ngModel)]="note" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
</div>
<!-- <div class="main-content d-flex height-100">
<div class="content d-flex flex-column width-100">
<div class="overflow-y-auto">
<div class="container-div">
<div class="ion-item-class-2 d-flex">
<div class="ion-icon-class">
<div hidden class="ion-icon-class">
<ion-icon slot="start" src="assets/images/icons-description.svg"></ion-icon>
</div>
<div class="ion-input-class-no-height width-100">
<div class="ion-input-class-no-height">
<ion-textarea [(ngModel)]="note" placeholder="Detalhes" rows="6" cols="20"></ion-textarea>
</div>
</div>
</div>
<div class="ion-item-container-no-border" (click)="getDoc()">
<div hidden class="ion-item-container-no-border" (click)="getDoc()">
<ion-label class="d-flex align-center">
<button class="btn-no-color">
<div class="attach-icon d-flex align-center">
@@ -35,29 +39,29 @@
</button>
</ion-label>
</div>
<div class="list " *ngFor="let document of documents; let i = index" >
<div class="list " *ngFor="let document of documents; let i = index" >
<ion-list>
<ion-item>
<ion-label>
<p class="d-flex ion-justify-content-between">
<span class="attach-title-item">{{document.Assunto}}</span>
<span class="app-name">{{document.appName}}</span>
<p class="d-flex ion-justify-content-between">
<span class="attach-title-item">{{document.Assunto}}</span>
<span class="app-name">{{document.appName}}</span>
<span class="close-button text-black cursor-pointer" (click)="removeAttachment(i)" >
<ion-icon class="font-20" src="assets/images/icons-delete-25.svg"></ion-icon>
</span>
</p>
</p>
<p><span class="span-left">{{document.EntidadeOrganicaNome}}</span><span class="span-right"> {{document.Data | date: 'dd-MM-yy'}} </span></p>
</ion-label>
</ion-item>
</ion-list>
</div>
</div>
</div>
</div>
</div>
</div> -->
@@ -68,7 +72,7 @@
</ion-item>
</ion-content>
<ion-footer>
<ion-footer class="ion-no-border">
<div class="buttons width-100">
<button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
<button class="btn-ok cursor-pointer" shape="round" (click)="save()">Gravar</button>
src/app/modals/add-note/add-note.page.scss
+13 -9
View File
@@ -11,7 +11,7 @@ color:#000;
float: left;
}
.content{
padding: 30px 20px 0 20px !important;
//padding: 30px 20px 0 20px !important;
margin: 0;
float: left;
@@ -20,7 +20,7 @@ float: left;
border: 1px solid #ebebeb;
border-radius: 5px;
padding-left: 10px;
}
.ion-item-container-no-border{
margin: 0px auto;
@@ -54,11 +54,7 @@ float: left;
padding-right: 10px;
float: left;
}
.ion-input-class-no-height{
border: 1px solid #ebebeb;
border-radius: 5px;
overflow: auto;
}
.list-people{
width: 256px;
float: left;
@@ -144,7 +140,15 @@ float: left;
}
.buttons{
display: flex;
width: 100% !important;
justify-content: space-between;
padding: 20px;
padding: 15px 0 15px 0;
overflow: auto;
}
}
.ion-input-class-no-height{
border: 1px solid #ebebeb;
border-radius: 5px;
overflow: auto;
margin: 5px 20px 0 20px !important;
}
src/app/pages/agenda/emend-message-modal/emend-message-modal.page.html
+6 -5
View File
@@ -1,6 +1,6 @@
<ion-header class="ion-no-border">
<div class="header-content">
<div class="header-icon-left">
<div hidden class="header-icon-left">
<button class="btn-no-color cursor-pointer" (click)="close()">
<ion-icon src="assets/images/icons-arrow-arrow-left.svg"></ion-icon>
</button>
@@ -12,11 +12,12 @@
</ion-header>
<ion-content>
<ion-item lines="none">
<ion-textarea [(ngModel)]="emendMessage" rows="4" cols="20" placeholder="Indique o que necessita ser revisto!"></ion-textarea>
</ion-item>
<div class="ion-input-class-no-height">
<ion-textarea [(ngModel)]="emendMessage" rows="6" cols="20" placeholder="Indique o que necessita ser revisto!"></ion-textarea>
</div>
</ion-content>
<ion-footer>
<ion-footer class="ion-no-border">
<div class="buttons width-100">
<button class="btn-cancel cursor-pointer" shape="round" (click)="close()">Cancelar</button>
<button class="btn-ok cursor-pointer" shape="round" (click)="save()">Enviar</button>
src/app/pages/agenda/emend-message-modal/emend-message-modal.page.scss
+14 -5
View File
@@ -1,7 +1,7 @@
.header-content{
//width: 360px;
overflow: auto;
margin: 25px auto;
margin-top: 25px;
}
.header-icon-left{
width: 36px;
@@ -9,15 +9,17 @@
color: #42b9fe;
float: left;
}
.header-title{
width: 264px;
font-family: Roboto;
font-size: 25px;
margin: 0 5px 0 5px;
margin: 0 5px 10px 20px;
padding: 0;
color:#000;
float: left;
}
.buttons{
width: 320px;
margin: 0 auto;
@@ -37,12 +39,19 @@
height: 44px;
border-radius: 22.5px;
--background: #42b9fe;
margin: 0 0px 0 12px;
margin: 0 0px 0 12px;
}
.buttons{
display: flex;
width: 100% !important;
justify-content: space-between;
padding: 15px;
padding: 15px 0 15px 0;
overflow: auto;
}
}
.ion-input-class-no-height{
border: 1px solid #ebebeb;
border-radius: 5px;
overflow: auto;
margin: 0 20px 0 20px !important;
}
src/app/pages/chat/chat.page.html
+2 -2
View File
@@ -43,7 +43,7 @@
<ion-list *ngSwitchCase="'Contactos'">
<ion-item-group>
<ion-item-sliding>
<div class="item width-100 d-flex" *ngFor="let dm of userDirectMessages">
<ion-item class="item width-100 d-flex" *ngFor="let dm of userDirectMessages">
<div class="item-icon">
<ion-icon class="icon" slot="start" src="assets/images/icons-chat-chat-40.svg"></ion-icon>
</div>
@@ -62,7 +62,7 @@
<ion-label *ngIf="dm.lastMessage">{{dm.lastMessage.msg}}</ion-label>
</div>
</div>
</div>
</ion-item>
</ion-item-sliding>
</ion-item-group>
</ion-list>
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.ts
+1 -1
View File
@@ -310,7 +310,7 @@ export class DespachoPage implements OnInit {
if( window.innerWidth <= 800){
classs = 'modal modal-desktop'
} else {
classs = 'modal modal-desktop'
classs = 'add-note-modal'
}
const modal = await this.modalController.create({
component: AddNotePage,
src/app/shared/chat/messages/messages.page.ts
+1 -1
View File
@@ -294,7 +294,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
this.messages = res['messages'].reverse();
console.log(this.messages);
// Reconnect in one second
await new Promise(resolve => setTimeout(resolve, 1000));
await new Promise(resolve => setTimeout(resolve, 5000));
await this.serverLongPull();
} else {
// Got message