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

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-05-21 15:39:24 +01:00
parent e94dd826a7
commit 10fd60b23e
8 changed files with 77 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/event-list/approve-event/approve-event.page.scss
+24 -6
View File
@@ -194,24 +194,42 @@ ion-menu{
/* @media only screen and (max-width: 1140px) {
@media only screen and (max-width: 800px) {
.content{
width: 100%;
width: 100% !important;
}
.aside-right{
display: none;
}
} */
/* @media only screen and (min-width: 1140px) {
}
@media only screen and (min-width: 801px) {
.div-icon{
display: none;
}
.content{
//width: 75%;
width: 65%;
border-right: 1px solid #d8d8d8;
}
.aside-right{
width: 35%;
}
}
@media only screen and (min-width: 1024px){
.content{
width: 70%;
}
.aside-right{
width: 30%;
}
}
@media only screen and (min-width: 1140px){
.content{
width: 75%;
}
.aside-right{
width: 25%;
}
} */
}
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+7 -19
View File
@@ -1,20 +1,6 @@
<!-- <ion-header hidden class="ion-no-border">
<ion-toolbar class="header-toolbar">
<div class="main-header">
<div class="title-content">
<app-btn-modal-dismiss></app-btn-modal-dismiss>
<div class="middle">
<ion-label class="title">{{ task.Folio}}</ion-label>
</div>
<div class="div-icon">
<ion-menu-button autoHide="false">
<ion-icon name="ellipsis-vertical-outline"></ion-icon>
</ion-menu-button>
</div>
</div>
</div>
</ion-toolbar>
</ion-header> -->
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-menu autoHide="false" side="end" content-id="main-content">
<ion-header>
@@ -60,7 +46,9 @@
<div class="content d-flex flex-column" *ngIf="task">
<div class="main-header" style="overflow: unset !important;">
<div class="title-content d-flex justify-between">
<app-btn-modal-dismiss></app-btn-modal-dismiss>
<div class="font-30 cursor-pointer" (click)="goBack()" defaultHref="#">
<ion-icon slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
</div>
<div class="middle flex-grow-1">
<ion-label class="title">{{ task.Folio}}</ion-label>
</div>
@@ -108,7 +96,7 @@
<div class="bottom-content width-100">
<ion-list>
<h5>Documentos Anexados</h5>
<ion-item class="ion-no-margin ion-no-padding">
<ion-item class="ion-no-margin ion-no-padding cursor-pointer">
<ion-label
(click)="viewDocument()">
<p class="attach-title-item">{{ task.Folio }}<span class="span-right color-red btn-size"><ion-icon hidden name="close"></ion-icon></span></p>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
+5
View File
@@ -1,4 +1,9 @@
@import '~src/function.scss';
.main-content{
background-color: #fff !important;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
}
.content{
padding: 30px 20px 0 20px !important;
margin: 0;
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+20 -6
View File
@@ -4,10 +4,10 @@ import { AttachmentsService } from 'src/app/services/attachments.service';
import { EventsService } from 'src/app/services/events.service';
import { InAppBrowser } from '@ionic-native/in-app-browser/ngx';
import { DailyWorkTask } from '../../../../models/dailyworktask.model';
import { ActivatedRoute, Router } from '@angular/router';
import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
import { formatDate } from '@angular/common';
import { Event } from '../../../../models/event.model';
import { MenuController, ModalController, NavParams, PopoverController } from '@ionic/angular';
import { MenuController, ModalController, PopoverController } from '@ionic/angular';
import { AlertService } from 'src/app/services/alert.service';
import { ExpedientTaskModalPage } from '../expedient-task-modal/expedient-task-modal.page';
import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.page';
@@ -44,11 +44,16 @@ export class ExpedienteDetailPage implements OnInit {
private menu: MenuController,
private router: Router,
private modalController: ModalController,
private navParams: NavParams,
private alertService: AlertService,
public popoverController: PopoverController,) {
this.serialnumber = this.navParams.get('serialNumber');
this.profile = this.navParams.get('profile');
public popoverController: PopoverController,
private activatedRoute: ActivatedRoute,
) {
this.activatedRoute.queryParams.subscribe(params => {
if(params["serialNumber"]) {
this.serialnumber = params["serialNumber"];
console.log(params["serialNumber"]);
}
});
}
ngOnInit() {
@@ -71,6 +76,15 @@ export class ExpedienteDetailPage implements OnInit {
this.modalController.dismiss();
}
goBack(){
let navigationExtras: NavigationExtras = {
queryParams: {
"expedientes": true,
}
};
this.router.navigate(['/home/gabinete-digital'], navigationExtras);
}
sendExpedienteToPending(){
this.processes.SetTaskToPending(this.serialnumber).subscribe(res=>{
console.log(res);
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
-1
View File
@@ -3,7 +3,6 @@
background-color: #fff !important;
border-top-left-radius: 25px;
border-top-right-radius: 25px;
}
.content{
padding: 30px 20px 0 20px !important;
src/app/shared/gabinete-digital/expedients/expedients.page.html
+1 -1
View File
@@ -23,7 +23,7 @@
<ion-item
class="expediente ion-no-padding cursor-pointer"
*ngFor = "let task of taskslist"
(click)="viewExpedientDetail(task.SerialNumber)"
(click)="goToExpediente(task.SerialNumber)"
>
<div class="item width-100">
<div class="exp-top-detail">
src/app/shared/gabinete-digital/expedients/expedients.page.ts
+11 -1
View File
@@ -1,5 +1,5 @@
import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
import { NavigationExtras, Router } from '@angular/router';
import { CalendarComponent } from 'ionic2-calendar';
import { DailyWorkTask } from '../../../models/dailyworktask.model';
@@ -31,6 +31,7 @@ export class ExpedientsPage implements OnInit {
private processes:ProcessesService,
private modalController: ModalController,
private alertService: AlertService,
private router: Router,
) {
this.profile = 'mdgpr';
}
@@ -87,6 +88,15 @@ export class ExpedientsPage implements OnInit {
}, 2000);
}
goToExpediente(serialNumber:any){
let navigationExtras: NavigationExtras = {
queryParams: {
"serialNumber": serialNumber,
}
};
this.router.navigate(['/home/gabinete-digital/expediente/expediente-detail'], navigationExtras);
}
async viewExpedientDetail(serialNumber:any) {
console.log(this.profile);
const modal = await this.modalController.create({
src/global.scss
+9
View File
@@ -603,6 +603,15 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
// center
app-approve-event ion-content .main-content{
max-width: 1366px !important;
margin: 0px auto !important;
}
app-expediente-detail ion-content .main-content{
max-width: 1366px !important;
margin: 0px auto !important;
}
app-pedido ion-content .main-content{
max-width: 1366px !important;