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

merge

Browse Source
This commit is contained in:
Peter Maquiran
2021-06-30 12:03:28 +01:00
parent deecf47f58 fa0abcec30
commit c2231e76cd
17 changed files with 70 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.html
+1 -1
View File
@@ -46,7 +46,7 @@
</ion-select>
<mat-form-field class="d-none d-md-block width-100">
<mat-form-field floatLabel="never" class="d-none d-md-block width-100">
<mat-select placeholder="Selecione agenda" [(ngModel)]="postData.CalendarName" >
<mat-option value="Oficial">
Oficial
src/app/pages/gabinete-digital/expediente/book-meeting-modal/book-meeting-modal.page.ts
+2 -10
View File
@@ -154,17 +154,9 @@ export class BookMeetingModalPage implements OnInit {
goBack() {
this.modalController.dismiss(null);
let navigationExtras: NavigationExtras = {
queryParams: {
"expedientes": true,
}
}
if( window.innerWidth < 801) {
this.router.navigate(['/home/gabinete-digital/expediente']);
} else {
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
window.history.back();
}
async saveTask(){
// issue12323423
let Attendees = this.taskParticipants.concat(this.taskParticipantsCc);
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+6 -1
View File
@@ -35,6 +35,7 @@ export class ExpedienteDetailPage implements OnInit {
fulltask: any;
eventsList: Event[];
serialnumber: string;
caller:string;
serialNumber: string;
profile: string;
intervenientes: any;
@@ -65,6 +66,9 @@ export class ExpedienteDetailPage implements OnInit {
if(params["params"].SerialNumber) {
this.serialnumber = params["params"].SerialNumber;
}
if(params["params"].caller) {
this.caller = params["params"].caller;
}
});
@@ -97,7 +101,7 @@ export class ExpedienteDetailPage implements OnInit {
}
goBack() {
if(this.task.Status == "Pending"){
if(this.task.Status == "Pending" && this.caller != 'events'){
if (window.innerWidth <= 800) {
this.router.navigate(['/home/gabinete-digital/pendentes']);
}
@@ -111,6 +115,7 @@ export class ExpedienteDetailPage implements OnInit {
}
}
else{
console.log('HERE');
this.activatedRoute.paramMap.subscribe(params => {
switch (params["params"].caller) {
case 'events':
src/app/pages/gabinete-digital/gabinete-digital.page.scss
+1
View File
@@ -229,6 +229,7 @@ ion-content{
width: 35%;
justify-content: flex-start !important;
border-right: 1px solid #d8d8d8;
border: 1px solid red;
.aside{
background:transparent;
src/app/pages/gabinete-digital/gabinete-digital.page.ts
-51
View File
@@ -189,57 +189,6 @@ export class GabineteDigitalPage implements OnInit {
this.openDiplomasPage('');
this.selectedElement='DiplomasAssinar';
}
/* this.activatedRoute.queryParams.subscribe(params => {
switch (params)
{
case params["eventos"]:
this.openEventsToApprovePage("MDGPR");
this.selectedElement='approval';
break;
case params["expedientes"]:
this.openExpedientListPage();
this.selectedElement='Correspondence';
this.expedientesPage.doRefresh();
break;
case params["pendentes"]:
this.openPendentesPage('');
this.selectedElement='Pending';
break;
case params["despachos"]:
this.openDespachosPage('');
this.selectedElement='Dispatches';
break;
case params["pedidos"]:
this.openPedidosPage('parecer');
this.selectedElement='RequestsForOpinion';
break;
case params["expedientespr"]:
this.openEventsToApprovePage("MDGPR");
this.selectedElement='Expediente Presidente'
break;
case params["despachospr"]:
this.openDespachosPrPage('');
this.selectedElement='DispatchesPr'
break;
case params["diplomas"]:
this.openDiplomasPage('validar');
this.selectedElement='DiplomasPorValidar';
break;
case params["diplomasassinar"]:
this.openDiplomasPage('');
this.selectedElement='DiplomasAssinar';
break;
}
}); */
}
refreshExpedientes(){
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.html
+1 -1
View File
@@ -11,7 +11,7 @@
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
<!-- <app-btn-modal-dismiss></app-btn-modal-dismiss> -->
<div class="middle d-flex align-center flex-grow-1">
<div class="middle">
<ion-label class="title">{{ task.Folio}}</ion-label>
</div>
<div class="div-icon">
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
+15 -48
View File
@@ -23,65 +23,32 @@
overflow:auto;
color:#000;
transform: translate3d(0, 1px, 0);
.header-top{
width: 360px;
margin: 0px auto;
overflow: auto;
padding: 0 !important;
background: #fff;
.middle{
padding: 0!important;
float: left;
width: 280px;
.title-content{
display: flex;
align-items: center;
}
.right{
padding: 0!important;
float: right;
font-size: 25px;
color: #0782c9;
margin: 5px 0 0 0;
}
}
.header-bottom{
width: 310px;
overflow: auto;
margin: 0 auto;
justify-content:space-between;
align-items: flex-start !important;
border-radius: 0 !important;
.header-bottom-icon{
width: 30px;
font-size: 25px;
float: left;
padding: 2px;
.middle{
/* width: calc(100% - 37px); */
overflow: auto;
}
.header-bottom-contacts{
width: 275px;
font-size: 15px;
color: #797979;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
float: left;
padding: 5px;
margin: 1px;
}
}
.title{
width: fit-content;
height: auto;
font-size: 25px;
overflow: auto;
float: left;
padding-left: 5px;
}
.div-icon{
width: 40px;
float: right;
font-size: 35px;
overflow: auto;
width: 37px !important;
font-size: 35px !important;
padding: 1px;
right: 0 !important;
}
}
}
ion-item-group{
margin: 15px;
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.ts
+5 -1
View File
@@ -39,6 +39,7 @@ export class PedidoPage implements OnInit {
fulltask: any;
eventsList: Event[];
serialnumber: string;
caller: string;
intervenientes: any;
cc: any = [];
loggeduser: User;
@@ -61,6 +62,9 @@ export class PedidoPage implements OnInit {
if(params["serialNumber"]) {
this.serialnumber = params["serialNumber"];
}
if(params["caller"]) {
this.caller = params["caller"];
}
});
}
@@ -445,7 +449,7 @@ export class PedidoPage implements OnInit {
}
goBack() {
if(this.task.Status == "Pending"){
if(this.task.Status == "Pending" && this.caller == 'gabinete-digital'){
if (window.innerWidth <= 800) {
this.router.navigate(['/home/gabinete-digital/pendentes']);
}