-
+
+
Gabinete Digital
-
+ -->
-
@@ -58,9 +77,19 @@
{{task.Senders}}
+
+
+
+ {{task.customDate}}
+
+
- Data
+
+ Agenda {{task.Agenda}} do Presidente da República
+
+
+ A sua agenda {{task.Agenda}}
+
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.scss b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
index 9e2e511c5..f5456ea3c 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.scss
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.scss
@@ -4,7 +4,7 @@ ion-content{
--padding-start:15px; */
/* --padding-bottom:15px; */
/* --background:#ecf8ff; */
- --background: transparent;
+ --background: #ecf8ff;
}
ion-segment{
overflow: auto;
@@ -27,8 +27,12 @@ ion-segment-button{
text-align: center;
}
.title-container{
+ background:#ecf8ff;
padding: 30px 20px 15px 20px !important;
//margin-bottom: 15px;
+ border-top-left-radius: 25px;
+ border-top-right-radius: 25px;
+
.title{
width: fit-content;
font-size: 25px !important;
@@ -118,11 +122,7 @@ ion-segment-button{
overflow:auto;
padding: 0 !important;
- border-top-left-radius: 25px;
- border-top-right-radius: 25px;
-
.aside-wrapper{
- //border: 1px solid red;
overflow: auto;
.listview{
width: 100%t;
@@ -269,6 +269,11 @@ ion-list{
.item-subject{
width: 84%;
float: left;
+
+ ion-label{
+ margin: 0 !important;
+ padding: 2.5px 10.5px 2.5px 10.5px;
+ }
}
.item-icon{
@@ -386,11 +391,17 @@ ion-list{
@media only screen and (min-width: 701px) {
+ ion-content{
+ --background: transparent;
+ }
.title{
font-size: 15px !important;
}
.main-content{
+ border-top-left-radius: 25px;
+ border-top-right-radius: 25px;
+
.aside-wrapper{
display: flex;
width: 35%;
diff --git a/src/app/pages/gabinete-digital/gabinete-digital.page.ts b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
index 33cb41b10..3fafb0a45 100644
--- a/src/app/pages/gabinete-digital/gabinete-digital.page.ts
+++ b/src/app/pages/gabinete-digital/gabinete-digital.page.ts
@@ -108,7 +108,7 @@ export class GabineteDigitalPage implements OnInit {
authService: AuthService,
public p: PermissionService
) {
- this.segmentVista = "listview";
+
this.loggeduser = authService.ValidatedUser;
window.onresize = (event) => {
// if not mobile remove all component
@@ -130,6 +130,13 @@ export class GabineteDigitalPage implements OnInit {
ngOnInit() {
+ if( window.innerWidth < 701) {
+ this.segmentVista = "listview";
+ }
+ else{
+ this.segmentVista = "boxview";
+ }
+
const pathname = window.location.pathname
this.LoadCounts();
@@ -173,10 +180,12 @@ export class GabineteDigitalPage implements OnInit {
"WorkflowName": element.workflowDisplayName,
"activityInstanceName": element.activityInstanceName,
"Status": element.workflowInstanceDataFields.Status,
+ "Agenda": element.workflowInstanceDataFields.Agenda,
+ "customDate": this.setFormatDate(new Date(element.workflowInstanceDataFields.StartDate), new Date(element.workflowInstanceDataFields.EndDate), element.workflowInstanceDataFields.IsAllDayEvent),
}
this.allProcessesList.push(task);
this.allProcessesList = removeDuplicate( this.allProcessesList)
- this.allProcessesList = this.sortArrayISODate(this.allProcessesList);
+ this.allProcessesList = this.sortArrayISODate(this.allProcessesList).reverse();
});
//this.pendentesstore.reset(this.allProcessesList);
this.skeletonLoader = false;
@@ -189,7 +198,58 @@ export class GabineteDigitalPage implements OnInit {
});
}
- viewProcessDetails(){}
+ setFormatDate(start:any, end:any, allday:boolean){
+ let customDate;
+ /* start = new Date();
+ end= new Date("2021-08-04T18:01:04.753Z"); */
+ //end = new Date("2021-09-04T18:01:04.753Z");
+
+ const totalSeconds = Math.floor((end - (start))/1000);;
+ const totalMinutes = Math.floor(totalSeconds/60);
+ const totalHours = Math.floor(totalMinutes/60);
+ const totalDays = Math.floor(totalHours/24);
+
+ const hours = totalHours - ( totalDays * 24 );
+ const minutes = totalMinutes - ( totalDays * 24 * 60 ) - ( hours * 60 );
+ const seconds = totalSeconds - ( totalDays * 24 * 60 * 60 ) - ( hours * 60 * 60 ) - ( minutes * 60 );
+
+ let diffDays = totalDays;
+ let diffMinutes = minutes;
+
+ console.log(allday);
+ if(totalDays == 0){
+ if(allday){
+ customDate = this.getCustomDate(start)+", "+this.getCustomHours(start)+" (todo dia)";
+ console.log(customDate);
+ return customDate;
+ }
+ else
+ {
+ //customDate = this.getCustomDate(start)+","+this.getCustomHours(start)+" ("+minutes+" mins)";
+ customDate = this.getCustomDate(start)+", "+this.getCustomHours(start)+" | "+this.getCustomHours(end);
+ return customDate;
+ }
+ }
+ else{
+ customDate = this.getCustomDate(start)+","+this.getCustomHours(start)+
+ " (termina:"+ this.getCustomDate(end)+","+this.getCustomHours(end)+")";
+ return customDate;
+ }
+ }
+
+ getCustomDate(thedate: Date){
+ return (thedate.getDay()+1) + "/" +
+ (thedate.getMonth()+1) + "/" +
+ thedate.getFullYear();
+ }
+ getCustomHours(thedate: Date){
+ return thedate.getHours() + ":" +
+ thedate.getMinutes();
+ }
+
+ viewProcessDetails(){
+
+ }
onSegmentVistaChange(){
diff --git a/src/app/pages/publications/view-publications/view-publications.page.ts b/src/app/pages/publications/view-publications/view-publications.page.ts
index bbc9eaabd..36d7382f5 100644
--- a/src/app/pages/publications/view-publications/view-publications.page.ts
+++ b/src/app/pages/publications/view-publications/view-publications.page.ts
@@ -89,7 +89,7 @@ export class ViewPublicationsPage implements OnInit {
}
getPublicationDetail() {
-
+
setTimeout(() => {
let allActions = this.publicationEventFolderStorage.list.concat(this.publicationTravelFolderService.list)
this.item = allActions.find((e)=> e.ProcessId == this.folderId);
@@ -128,6 +128,8 @@ export class ViewPublicationsPage implements OnInit {
});
+ console.log(folderId);
+
this.publicationListStorage.add(folderId, this.publicationList)
this.showLoader = false;
diff --git a/src/app/store/publication-list.service.ts b/src/app/store/publication-list.service.ts
index 816798a22..92e6ad43b 100644
--- a/src/app/store/publication-list.service.ts
+++ b/src/app/store/publication-list.service.ts
@@ -11,13 +11,13 @@ export class PublicationListService {
// main data
private _document: Publication[] = []
// local storage keyName
- private keyName: string;
+ private keyName: string;
constructor() {
this.keyName = (SHA1(this.constructor.name+ 'view-publication-list/local')).toString()
- setTimeout(()=>{
+ setTimeout(()=>{
let restore = localstoreService.get(this.keyName, [])
this._document = restore.document
}, 10)
@@ -35,7 +35,7 @@ export class PublicationListService {
add(folderId, document) {
this._document[folderId] = document
- setTimeout(()=> {
+ setTimeout(()=> {
localstoreService.set(this.keyName, {
document: this._document
})
@@ -45,4 +45,4 @@ export class PublicationListService {
}
-export const PublicationListStorage = new PublicationListService()
\ No newline at end of file
+export const PublicationListStorage = new PublicationListService()