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

git pull made

Browse Source
This commit is contained in:
Eudes Inácio
2021-12-08 19:48:33 +01:00
parent ed9fa5829f 50c976b8f6
commit f7add4dfa5
49 changed files with 501 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/event-list/approve-event-modal/approve-event-modal.page.scss
+9 -7
View File
@@ -144,7 +144,7 @@ ion-menu{
.app-name{
background: #42b9f2;
background: var(--title-text-color);
border-radius: 18px;
text-align: center;
display: flex;
@@ -163,18 +163,20 @@ ion-menu{
.close-button {
display: none;
height: 20px;
}
.list:hover {
.app-name {
display: none;
}
.app-name {
display: none;
}
.close-button {
display: block !important;
}
.close-button {
display: block !important;
height: 20px;
}
}
.attach-title-item{
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.scss
+2 -1
View File
@@ -174,7 +174,7 @@
.app-name{
background: #42b9f2;
background: var(--title-text-color);
border-radius: 18px;
text-align: center;
display: flex;
@@ -193,6 +193,7 @@
.close-button {
display: none;
height: 20px;
}
src/app/pages/gabinete-digital/expediente/expedient-task-modal/expedient-task-modal.page.scss
+3 -2
View File
@@ -154,7 +154,7 @@ font-size: 13px;
.app-name{
background: #42b9f2;
background: var(--title-text-color);
border-radius: 18px;
text-align: center;
display: flex;
@@ -173,6 +173,7 @@ font-size: 13px;
.close-button {
display: none;
height: 20px;
}
@@ -189,7 +190,7 @@ font-size: 13px;
.app-name{
background: #42b9f2;
background: var(--title-text-color);
border-radius: 18px;
text-align: center;
display: flex;
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+1 -1
View File
@@ -118,7 +118,7 @@
<button (click)="openExpedientActionsModal('1',fulltask)" class="btn-cancel" shape="round" >Solicitar Parecer</button>
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
<button (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
<button (click)="openNewGroupPage(task)" class="btn-cancel" shape="round" >Iniciar Conversa</button>
<div hidden class="solid"></div>
<button hidden class="btn-cancel" shape="round" >Delegar</button>
</div> -->
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+3 -2
View File
@@ -642,8 +642,8 @@ export class ExpedienteDetailPage implements OnInit {
}
else {
this.dataService.set("newGroup", true);
/* this.closeAllDesktopComponents();
this.showNewGroup=true; */
this.dataService.set("task", this.task);
this.dataService.set("newGroupName", this.task.Folio);
}
}
@@ -653,6 +653,7 @@ export class ExpedienteDetailPage implements OnInit {
cssClass: 'modal modal-desktop',
componentProps: {
name: this.task.Folio,
task: this.task
},
});
await modal.present();
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+4 -1
View File
@@ -63,7 +63,7 @@
<div class="bottom-content width-100">
<ion-list>
<h5>Documentos Anexados</h5>
<ion-item *ngFor="let attachment of attachments"
<ion-item *ngFor="let attachment of attachments"
class="ion-no-margin ion-no-padding cursor-pointer"
>
<ion-label
@@ -130,6 +130,9 @@
<button (click)="openBookMeetingModal(task)" class="btn-cancel" shape="round" >Marcar Reunião</button>
<button (click)="sendExpedienteToPending()" *ngIf="task.Status != 'Pending'" class="btn-cancel" shape="round" >Enviar para Pendentes</button>
</div>
<div class="buttons">
<button (click)="openNewGroupPage(task)" class="btn-cancel" shape="round" >Iniciar Conversa</button>
</div>
</div>
</div>
</div>
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+31 -1
View File
@@ -26,6 +26,8 @@ import { BackgroundService } from 'src/app/services/background.service';
import { PermissionService } from 'src/app/services/worker/permission.service';
import { ViewDocumentPage } from 'src/app/modals/view-document/view-document.page';
import { ThemeService } from 'src/app/services/theme.service'
import { DataService } from 'src/app/services/data.service';
import { NewGroupPage } from 'src/app/pages/chat/new-group/new-group.page';
@Component({
@@ -66,7 +68,8 @@ export class PedidoPage implements OnInit {
private sqliteservice: SqliteService,
private backgroundservices: BackgroundService,
private platform: Platform,
public ThemeService: ThemeService
public ThemeService: ThemeService,
private dataService: DataService,
) {
this.loggeduser = authService.ValidatedUser;
@@ -477,6 +480,33 @@ export class PedidoPage implements OnInit {
modal.onDidDismiss();
}
openNewGroupPage(task?:any){
this.router.navigate(['/home/chat']);
this.dataService.set("newGroup", true);
if( window.innerWidth < 801){
this.newGroup();
}
else{
this.dataService.set("newGroup", true);
this.dataService.set("task", this.task);
this.dataService.set("newGroupName", this.task.Folio);
}
}
async newGroup(){
const modal = await this.modalController.create({
component: NewGroupPage,
cssClass: 'modal modal-desktop',
componentProps: {
name: this.task.Folio,
task: this.task
},
});
await modal.present();
modal.onDidDismiss();
}
// async viewEventDetail(eventId: any) {
// const modal = await this.modalController.create({