Merge branch 'developer' of bitbucket.org:equilibriumito/gabinete-digital into developer

src/app/modals/profile/profile.page.html

@@ -57,7 +57,7 @@
               <div class="approve-event-detail">
                 <p *ngIf = "item.Service == 'agenda'">{{item.Location}}</p>
                 <h3 id="profile-title">{{item.title}}</h3>
-                <p *ngIf = "item.Service != 'agenda'">{{item.body}}</p>
+                <p id="profile-title" *ngIf = "item.Service != 'agenda'">{{item.body}}</p>
               </div>
               <!-- <div class="notification-label-MD-official" *ngIf = "item.Service == 'agenda' && item.TypeAgenda == 'official' && item.Role == '100000011'"   ></div>
               <div class="notification-label-MD-pessoal" *ngIf = "item.Service == 'agenda' && item.TypeAgenda == 'pessoal' && item.Role == '100000011'"   ></div>

src/app/modals/profile/profile.page.scss

@@ -1,60 +1,58 @@
-.profile-header{
+.profile-header {
   margin: 0 em(20px);
   // background-color: #0782c9;
   padding: 20px 20px;
-  border: 0!important;
+  border: 0 !important;
 
-  .div-logo{
+  .div-logo {
     background: transparent;
     width: calc(100% - 40px) !important;
     justify-content: center;
     display: flex;
     float: left;
 
-    .logo{
+    .logo {
       width: 140px;
-      .img{
+      .img {
         width: 100%;
         margin: 0px auto;
       }
     }
   }
 }
-.btn-close{
+.btn-close {
   float: right !important;
 }
-.profile-content{
-    padding: 20px 20px;
-    //color: var(--profile-text-color) !important;
-    
+.profile-content {
+  padding: 20px 20px;
+  //color: var(--profile-text-color) !important;
 }
 
-.icon{
-    font-size: 40px;
+.icon {
+  font-size: 40px;
 }
 
-.profile-title{
+.profile-title {
   font-weight: 300;
   font-size: 20px !important;
   margin-bottom: 40px !important;
   color: var(--profile-text-color) !important;
-
 }
 
-.line{
+.line {
   width: 100% !important;
   margin-top: 15px;
   border-top: 1px solid #d8d8d8;
   color: var(--profile-title-color-RoleDescription) !important;
 }
 
-.btn-delete{
-  background:#ffe0e0 !important;
+.btn-delete {
+  background: #ffe0e0 !important;
   width: 40% !important;
   margin-left: 0 !important;
 }
 
-.btn-cancel{
+.btn-cancel {
   width: 40% !important;
   margin-right: 0 !important;
 }
@@ -63,14 +61,13 @@
   width: 100% !important;
 }
 
-ion-list{
+ion-list {
   background-color: transparent !important;
 }
 
-
-.notifications-content{
+.notifications-content {
   padding: 0px 20px;
-  .item{
+  .item {
     border-radius: 15px;
     box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.07);
     border: solid 1px #e9e9e9;
@@ -81,37 +78,38 @@ ion-list{
     color: #000;
     overflow: hidden;
 
-    .notification-item{
+    .notification-item {
       width: fit-content;
       float: left;
       margin-right: 10px;
       padding: 0 !important;
       overflow: auto;
-
-
     }
-    .notification-icon{
+    .notification-icon {
       font-size: 35px !important;
     }
-    .approve-event-time{
+    .approve-event-time {
       width: fit-content !important;
       float: left;
     }
-    .approve-event-detail{
+    .approve-event-detail {
       width: calc(100% - 115px) !important;
       float: left;
-      #profile-title{
+      #profile-title {
         width: 250px;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
     }
-    .notification-label-MD-official{
+    .notification-label-MD-official {
       float: right;
       width: 5px;
       height: 100%;
       border-radius: 0% 100% 100% 0%;
       background-color: #ffb703;
     }
-    .notification-label-MD-pessoal{
+    .notification-label-MD-pessoal {
       float: right;
       width: 5px;
       height: 100%;
@@ -119,21 +117,19 @@ ion-list{
       background-color: #ff0303;
     }
 
-    .item-conten{
+    .item-conten {
       border-right: 5px solid var(--notificationtypeagenda);
       border-radius: 5px;
     }
 
-
-
-    .notification-label-PR-official{
+    .notification-label-PR-official {
       float: right;
       width: 5px;
       height: 100%;
       border-radius: 0% 100% 100% 0%;
       background-color: #03d838;
     }
-    .notification-label-PR-pessoal{
+    .notification-label-PR-pessoal {
       float: right;
       width: 5px;
       height: 100%;
@@ -141,8 +137,7 @@ ion-list{
       background-color: #8b0ae0;
     }
   }
-
 }
-.item-inner{
+.item-inner {
   padding: 0 !important;
 }

src/app/modals/profile/profile.page.ts

@@ -134,7 +134,7 @@ export class ProfilePage implements OnInit {
 
   getFormatedTime(dateString) {
     var date = new Date(dateString);
-    var hours = date.getHours() > 12 ? date.getHours() - 12 : date.getHours();
+    var hours = date.getHours() /* > 12 ? date.getHours() - 12 : date.getHours() */;
     var am_pm = date.getHours() >= 12 ? "pm" : "am";
     var minutes = date.getMinutes() < 10 ? "0" + date.getMinutes() : date.getMinutes();
     let time = hours + ":" + minutes /* + " " + am_pm */;

src/app/services/notifications.service.ts

@@ -157,6 +157,12 @@ export class NotificationsService {
     PushNotifications.addListener('pushNotificationActionPerformed',
       (notification: ActionPerformed) => {
         console.log('Push action performed: ' + JSON.stringify(notification));
+       /*  this.DataArray.push(notification.notification)
+        console.log("On ReceiveNotification", this.DataArray)
+        this.storageService.store("Notifications", this.DataArray)
+        this.eventtrigger.publishSomeData({
+          notification: "recive"
+        }) */
         this.notificatinsRoutes(notification)
       }
     );