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

dix bugs

Browse Source
This commit is contained in:
Peter Maquiran
2024-02-28 09:04:11 +01:00
parent d851aff6ef
commit a5f458de2e
111 changed files with 7528 additions and 942 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.html
+3 -3
View File
@@ -1,7 +1,7 @@
<ion-content class="container-wrapper" >
<div *ngIf="task" class="main-content d-flex height-100 overflow-hidden">
<div class="width-100 d-flex flex-column content" *ngIf="task">
<app-task-details
<app-task-details
*ngIf="task"
[task]=task
[intervenientes]=intervenientes
@@ -15,7 +15,7 @@
></app-task-details>
</div>
<div class="aside-right flex-column height-100 overflow-y-auto">
<!-- <div class="aside-right flex-column height-100 overflow-y-auto">
<div class="buttons">
<div *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" class="option-desc"> <div>Enviar para o PR</div> </div>
<button *ngIf="p.userPermission([p.permissionList.Gabinete.md_tasks])" (click)="openAddNoteModal('Aprovar')" class="btn-cancel" shape="round" >Solicitar consideração superior</button>
@@ -32,7 +32,7 @@
<button *ngIf="p.userPermission([p.permissionList.Chat.access])" (click)="openNewGroupPage()" class="btn-cancel" shape="round" >Iniciar Conversa</button>
<div class="solid"></div>
</div>
</div>
</div> -->
</div>
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
+37 -36
View File
@@ -8,6 +8,7 @@
padding: 0px 0px 0 0px !important;
margin: 0;
float: left;
width: 100%;
}
.color-red{
font-weight: 500;
@@ -277,45 +278,45 @@ ion-button{
@media only screen and (max-width: 800px) {
.content{
width: 100% !important;
}
.aside-right{
display: none;
}
}
@media only screen and (min-width: 801px) {
.menu-ptions{
display: none !important;
}
.content{
width: 65%;
border-right: 1px solid #d8d8d8;
}
// @media only screen and (max-width: 800px) {
// .content{
// width: 100% !important;
// }
// .aside-right{
// display: none;
// }
// }
// @media only screen and (min-width: 801px) {
// .menu-ptions{
// display: none !important;
// }
// .content{
// width: 65%;
// border-right: 1px solid #d8d8d8;
// }
.aside-right{
width: 35%;
}
}
// .aside-right{
// width: 35%;
// }
// }
@media only screen and (min-width: 1024px){
.content{
width: 70%;
}
.aside-right{
width: 30%;
}
}
// @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%;
}
}
// @media only screen and (min-width: 1140px){
// .content{
// width: 75%;
// }
// .aside-right{
// width: 25%;
// }
// }
.option-desc {
display: flex;
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.ts
+38 -16
View File
@@ -9,7 +9,7 @@ import { BookMeetingModalPage } from '../book-meeting-modal/book-meeting-modal.p
import { ViewEventPage } from 'src/app/pages/agenda/view-event/view-event.page';
import { momentG } from 'src/plugin/momentG'
import { DiscartExpedientModalPage } from '../../discart-expedient-modal/discart-expedient-modal.page';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
import { DKOptsExpedientePage } from 'src/app/shared/popover/desktop/dk-opts-expediente/dk-opts-expediente.page';
import { ToastService } from 'src/app/services/toast.service';
import { SearchPage } from 'src/app/pages/search/search.page';
import { SearchList } from 'src/app/models/search-document';
@@ -31,6 +31,7 @@ import { LoginUserRespose } from 'src/app/models/user.model';
import { SessionStore } from 'src/app/store/session.service';
import { HttpErrorHandle } from 'src/app/services/http-error-handle.service';
import { TaskService } from 'src/app/services/task.service';
import { OptsExpedientePage } from 'src/app/shared/popover/opts-expediente/opts-expediente.page';
@Component({
@@ -591,21 +592,42 @@ export class ExpedienteDetailPage implements OnInit {
async openOptions(taskAction?: any) {
const popover = await this.popoverController.create({
component: OptsExpedientePage,
cssClass: 'exp-options',
componentProps: {
task: this.task,
fulltask: this.fulltask,
taskAction: taskAction,
},
translucent: true
});
return await popover.present().then(() => {
this.TaskService.loadExpedientes()
}, (error) => {
console.log(error)
})
if (window.innerWidth > 500) {
const model = await this.popoverController.create({
component: DKOptsExpedientePage,
cssClass: 'exp-options-desktop',
componentProps: {
task: this.task,
fulltask: this.fulltask,
taskAction: taskAction,
}
});
return await model.present().then(() => {
this.TaskService.loadExpedientes()
}, (error) => {
console.log(error)
})
} else {
const popover = await this.popoverController.create({
component: OptsExpedientePage,
cssClass: 'exp-options',
componentProps: {
task: this.task,
fulltask: this.fulltask,
taskAction: taskAction,
},
translucent: true
});
return await popover.present().then(() => {
this.TaskService.loadExpedientes()
}, (error) => {
console.log(error)
})
}
}
openNewGroupPage() {