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

merge

Browse Source
This commit is contained in:
Peter Maquiran
2023-08-28 17:32:11 +01:00
parent 624d0b1d7a f3f84ed475
commit ead20b5b4e
38 changed files with 109 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/modals/document-detail/document-detail.page.scss
+1 -1
View File
@@ -102,7 +102,7 @@ ion-button{
background: #ffb703; background: #ffb703;
float: right; float: right;
padding: 5px 13.5px 5px 13.5px; padding: 5px 13.5px 5px 13.5px;
color: #fff; color: black;
font-size: rem(14); font-size: rem(14);
} }
src/app/modals/view-event/view-event.page.scss
+1 -1
View File
@@ -297,5 +297,5 @@ ion-menu{
background: var(--label-bg-color); background: var(--label-bg-color);
float: right; float: right;
padding: 5px 13.5px 5px 13.5px; padding: 5px 13.5px 5px 13.5px;
color: #fff; color: black;
} }
src/app/pages/agenda/agenda.page.html
+26 -23
View File
@@ -14,11 +14,11 @@
<!-- Toolbar --> <!-- Toolbar -->
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar> <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<div [class]="weeksToShow" > <div class="weeksToShow">
<!-- Calendar is here --> <!-- Calendar is here -->
<div class="calendar-segment-{{profile}}" [class.calendar-segment-pr-force]="SessionStore.user.Profile =='PR'"> <div class="calendar-segment-{{profile}}" [class.calendar-segment-pr-force]="SessionStore.user.Profile =='PR'">
<div class="calendar-container" [class]="calendarHeight"> <div class="calendar-container" class="calendarHeight" >
<ion-row class="ion-justify-content-between calendar-tool-tip"> <ion-row class="ion-justify-content-between calendar-tool-tip">
<ion-row class="ion-align-items-center first-row"> <ion-row class="ion-align-items-center first-row">
@@ -139,25 +139,28 @@
</thead> </thead>
</table> </table>
<calendar <div class="calendar-conteiner-height overflow-hidden" [style.height]="height">
class="calendar-component" <calendar
[eventSource]="listToPresent" class="calendar-component"
[calendarMode]="calendar.mode" [eventSource]="listToPresent"
[currentDate]="calendar.currentDate" [calendarMode]="calendar.mode"
(onEventSelected)="onEventSelected($event)" [currentDate]="calendar.currentDate"
(onTitleChanged)="onViewTitleChanged($event)" (onEventSelected)="onEventSelected($event)"
(onRangeChanged)="onRangeChanged($event)" (onTitleChanged)="onViewTitleChanged($event)"
(onCurrentDateChanged)="onCurrentChanged($event)" (onRangeChanged)="onRangeChanged($event)"
queryMode="remote" (onCurrentDateChanged)="onCurrentChanged($event)"
startHour="6" queryMode="remote"
endHour="20" startHour="6"
step="30" endHour="20"
startingDayMonth="1" step="30"
noEventsLabel="Sem Eventos" startingDayMonth="1"
allDayLabel="Todo o dia" noEventsLabel="Sem Eventos"
[monthviewDisplayEventTemplate]="template" allDayLabel="Todo o dia"
> [monthviewDisplayEventTemplate]="template"
</calendar> >
</calendar>
</div>
<!-- Adding a customized ng-template --> <!-- Adding a customized ng-template -->
<ng-template #template let-view="view" let-row="row" let-col="col"> <ng-template #template let-view="view" let-row="row" let-col="col">
@@ -182,12 +185,12 @@
<div class="calendar-title-container px-20 d-flex"> <div class="calendar-title-container px-20 d-flex">
<ion-row class="timeline-date align-center pr-10"> <ion-row class="timeline-date align-center pr-10">
<button class="no-color" *ngIf="showCalendar" (click)="calendarHeight=['height-75'];showCalendar=false"> <button class="no-color" *ngIf="showCalendar" (click)="height='0px';showCalendar=false">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps font-25" src="assets/images/icons-collaps-up.svg" ></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps font-25" src="assets/images/icons-collaps-up.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps font-25" src="assets/images/theme/gov/icons-collaps-up.svg" ></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps font-25" src="assets/images/theme/gov/icons-collaps-up.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="collaps font-25" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-up.svg"></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="collaps font-25" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-up.svg"></ion-icon>
</button> </button>
<button class="no-color" *ngIf="!showCalendar" (click)="calendarHeight=['height-356'];showCalendar=true"> <button class="no-color" *ngIf="!showCalendar" (click)="weekToShow();showCalendar=true">
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps font-25" src="assets/images/icons-collaps-down.svg" ></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'default' " class="collaps font-25" src="assets/images/icons-collaps-down.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps font-25" src="assets/images/theme/gov/icons-collaps-down.svg" ></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'gov' " class="collaps font-25" src="assets/images/theme/gov/icons-collaps-down.svg" ></ion-icon>
<ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="collaps font-25" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-down.svg" ></ion-icon> <ion-icon *ngIf="ThemeService.currentTheme == 'doneIt' " class="collaps font-25" src="assets/images/theme/{{ThemeService.currentTheme}}/icons-collaps-down.svg" ></ion-icon>
src/app/pages/agenda/agenda.page.scss
+12 -2
View File
@@ -242,7 +242,7 @@ label{
color: #e16817; color: #e16817;
} }
td.monthview-primary-with-event { td.monthview-primary-with-event {
background-color: red !important; background-color: white !important;
} }
.header-title{ .header-title{
font-family: Roboto; font-family: Roboto;
@@ -1031,7 +1031,7 @@ $font-size: rem(15);
} }
.height-356 { .height-356 {
height: 369px; height: 360px;
} }
} }
@@ -1066,3 +1066,13 @@ $font-size: rem(15);
} }
.calendar-conteiner-height {
height: 100%;
transition: 0.5s;
animation: 0.5s;
-webkit-transition: 0.5s;
-moz-transition: 0.5s;
-ms-transition: 0.5s;
-o-transition: 0.5s;
-webkit-animation: 0.5s;
}
src/app/pages/agenda/agenda.page.ts
+23 -20
View File
@@ -291,34 +291,37 @@ export class AgendaPage implements OnInit {
}, 1000) }, 1000)
} }
weeksToShow = [] height = '75px'
weekToShow() { weekToShow() {
setTimeout(() => { setTimeout(() => {
let num = 0; try {
let weekNum = 0;
function Week(a) { function Week(a) {
for(let b of a.querySelectorAll('td')) { for(let b of a.querySelectorAll('td')) {
if(!b.className.includes('text-muted')) { if(!b.className.includes('text-muted')) {
num++; weekNum++;
return true return true
}
} }
} }
const dayBoxHeight = document.querySelector('.monthview-container .swiper-container .swiper-slide-active table tbody tr td').clientHeight
const weeks = document.querySelectorAll('.monthview-container .swiper-container .swiper-slide-active table tbody tr');
for (let week of weeks as any ){
Week(week)
}
this.showCalendar = true
this.height = (weekNum * dayBoxHeight) +'px'
} catch (e) {
setTimeout(()=> {
this.weekToShow()
}, 100)
} }
for (let a of document.querySelectorAll('.monthview-container .swiper-container .swiper-slide-active table tbody tr') as any ){
Week(a)
}
if(num <= 5) {
this.weeksToShow = ["week-5"]
} else {
this.weeksToShow = ["week-6"]
}
}, 250) }, 250)
} }
src/app/pages/agenda/view-event/view-event.page.scss
+1 -1
View File
@@ -298,7 +298,7 @@ ion-menu{
background: var(--label-bg-color); background: var(--label-bg-color);
float: right; float: right;
padding: 5px 13.5px 5px 13.5px; padding: 5px 13.5px 5px 13.5px;
color: #fff; color: black;
} }
.text { .text {
src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss
+1 -1
View File
@@ -112,7 +112,7 @@ ion-button{
background: var(--label-bg-color); background: var(--label-bg-color);
float: right; float: right;
padding: 5px 13.5px 5px 13.5px; padding: 5px 13.5px 5px 13.5px;
color: #fff; color: black;
font-size: rem(14); font-size: rem(14);
} }
src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss
+1 -1
View File
@@ -198,7 +198,7 @@ ion-item{
/* font-size: 12px; */ /* font-size: 12px; */
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss
+1 -1
View File
@@ -71,7 +71,7 @@ ion-button{
background: var(--label-bg-color); background: var(--label-bg-color);
float: right; float: right;
padding: 5px 13.5px 5px 13.5px; padding: 5px 13.5px 5px 13.5px;
color: #fff; color: black;
font-size: rem(14); font-size: rem(14);
} }
src/app/pages/gabinete-digital/despachos/despachos.page.scss
+1 -1
View File
@@ -177,7 +177,7 @@ ion-item{
/* font-size: 12px; */ /* font-size: 12px; */
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss
+1 -1
View File
@@ -137,7 +137,7 @@ ion-button{
background: var(--label-bg-color); background: var(--label-bg-color);
float: right; float: right;
padding: 5px 13.5px 5px 13.5px; padding: 5px 13.5px 5px 13.5px;
color: #fff; color: black;
font-size: rem(14); font-size: rem(14);
} }
src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
+1 -1
View File
@@ -183,7 +183,7 @@ ion-item{
/* font-size: rem(12); */ /* font-size: rem(12); */
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
+1 -1
View File
@@ -177,7 +177,7 @@ ion-item{
/* font-size: 12px; */ /* font-size: 12px; */
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss
+1 -1
View File
@@ -124,7 +124,7 @@ ion-button{
background: var(--label-bg-color); background: var(--label-bg-color);
float: right; float: right;
padding: 5px 13.5px 5px 13.5px; padding: 5px 13.5px 5px 13.5px;
color: #fff; color: black;
font-size: rem(14); font-size: rem(14);
} }
src/app/pages/gabinete-digital/diplomas/diplomas.page.scss
+1 -1
View File
@@ -177,7 +177,7 @@ ion-item{
/* font-size: 12px; */ /* font-size: 12px; */
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss
+1 -1
View File
@@ -103,7 +103,7 @@ ion-button{
background: var(--label-bg-color); background: var(--label-bg-color);
float: right; float: right;
padding: 5px 13.5px 5px 13.5px; padding: 5px 13.5px 5px 13.5px;
color: #fff; color: black;
font-size: rem(14); font-size: rem(14);
} }
src/app/pages/gabinete-digital/expediente/expediente.page.scss
+1 -1
View File
@@ -173,7 +173,7 @@ ion-item{
/*font-size: rem(12); /*font-size: rem(12);
*/float: right; */float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
-webkit-border-radius: 15px; -webkit-border-radius: 15px;
-moz-border-radius: 15px; -moz-border-radius: 15px;
-ms-border-radius: 15px; -ms-border-radius: 15px;
src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss
+1 -1
View File
@@ -102,7 +102,7 @@ ion-button{
background: var(--label-bg-color); background: var(--label-bg-color);
float: right; float: right;
padding: 5px 13.5px 5px 13.5px; padding: 5px 13.5px 5px 13.5px;
color: #fff; color: black;
font-size: rem(14); font-size: rem(14);
} }
src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss
+1 -1
View File
@@ -176,7 +176,7 @@ ion-item{
/* font-size: 12px; */ /* font-size: 12px; */
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/app/pages/gabinete-digital/gabinete-digital.page.scss
+1 -1
View File
@@ -396,7 +396,7 @@ ion-list {
font-size: rem(12); font-size: rem(12);
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss
+1 -1
View File
@@ -68,7 +68,7 @@ ion-button{
background: var(--label-bg-color); background: var(--label-bg-color);
float: right; float: right;
padding: 5px 13.5px 5px 13.5px; padding: 5px 13.5px 5px 13.5px;
color: #fff; color: black;
font-size: rem(14); font-size: rem(14);
} }
src/app/pages/gabinete-digital/pedidos/pedidos.page.scss
+1 -1
View File
@@ -174,7 +174,7 @@ ion-item{
/* font-size: rem(12); */ /* font-size: rem(12); */
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/app/pages/gabinete-digital/pendentes/pendentes.page.scss
+1 -1
View File
@@ -172,7 +172,7 @@ ion-item{
/* font-size: 12px; */ /* font-size: 12px; */
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/app/services/agenda/list-box.service.ts
+1 -5
View File
@@ -72,8 +72,6 @@ export class ListBoxService {
endTime: event.end endTime: event.end
}) })
const day = this.dateService.getDay(event.start) const day = this.dateService.getDay(event.start)
event['manyDays'] = !this.dateService.isSameDate(event.start, event.end) event['manyDays'] = !this.dateService.isSameDate(event.start, event.end)
@@ -89,8 +87,7 @@ export class ListBoxService {
if (this.dateService.notSameDate(startDate, endDate)) { if (this.dateService.notSameDate(startDate, endDate)) {
if (diffDays <= 150 ) {
if (diffDays <= 150 && !event.event.IsAllDayEvent ) {
if (diffDays >= 1) { if (diffDays >= 1) {
@@ -138,7 +135,6 @@ export class ListBoxService {
if(this.CanPush(event, selectedDate)) days[day].push(event) if(this.CanPush(event, selectedDate)) days[day].push(event)
} }
} else { } else {
if(this.CanPush(event, selectedDate)) days[day].push(event) if(this.CanPush(event, selectedDate)) days[day].push(event)
} }
} else { } else {
src/app/services/chat/message.service.ts
+9
View File
@@ -698,4 +698,13 @@ export class MessageService {
} catch (error) {} } catch (error) {}
} }
UIdata() {
this.incomingFromCurrentUser = this.u.username!= SessionStore.user.UserName
this.hasMessage = this.msg !=''
}
incomingFromCurrentUser = false
hasMessage = false
} }
src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss
+1 -1
View File
@@ -179,7 +179,7 @@ ion-item{
/* font-size: rem(12); */ /* font-size: rem(12); */
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss
+1 -1
View File
@@ -181,7 +181,7 @@ ion-item{
/* font-size: rem(12); */ /* font-size: rem(12); */
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss
+1 -1
View File
@@ -166,7 +166,7 @@
/* font-size: 12px; */ /* font-size: 12px; */
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss
+1 -1
View File
@@ -102,7 +102,7 @@ ion-item{
//font-size: 12px; //font-size: 12px;
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/app/shared/gabinete-digital/expedients/expedients.page.scss
+1 -1
View File
@@ -102,7 +102,7 @@ ion-item{
//font-size: 12px; //font-size: 12px;
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.scss
+1 -1
View File
@@ -72,7 +72,7 @@ ion-button{
background: var(--label-bg-color); background: var(--label-bg-color);
float: right; float: right;
padding: 5px 13.5px 5px 13.5px; padding: 5px 13.5px 5px 13.5px;
color: #fff; color: black;
font-size: rem(14); font-size: rem(14);
} }
src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.scss
+1 -1
View File
@@ -72,7 +72,7 @@ ion-button{
background: var(--label-bg-color); background: var(--label-bg-color);
float: right; float: right;
padding: 5px 13.5px 5px 13.5px; padding: 5px 13.5px 5px 13.5px;
color: #fff; color: black;
font-size: rem(14); font-size: rem(14);
} }
src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss
+1 -1
View File
@@ -77,7 +77,7 @@ ion-button{
background: var(--label-bg-color); background: var(--label-bg-color);
float: right; float: right;
padding: 5px 13.5px 5px 13.5px; padding: 5px 13.5px 5px 13.5px;
color: #fff; color: black;
font-size: rem(14); font-size: rem(14);
} }
src/app/shared/gabinete-digital/pedidos/pedidos.page.scss
+1 -1
View File
@@ -169,7 +169,7 @@ ion-item{
/* font-size: 12px; */ /* font-size: 12px; */
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/app/shared/gabinete-digital/pendentes/pendentes.page.scss
+1 -1
View File
@@ -164,7 +164,7 @@ ion-item{
/* font-size: 12px; */ /* font-size: 12px; */
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
.exp-date{ .exp-date{
src/global.scss
-1
View File
@@ -257,7 +257,6 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent-
} */ } */
.calendar-container{ .calendar-container{
height: 333px;
z-index: 10; z-index: 10;
transition: 0.5s; transition: 0.5s;
overflow-y: hidden; overflow-y: hidden;
src/theme/variables.scss
+1 -1
View File
@@ -648,7 +648,7 @@ $app-theme: mat-light-theme(
font-size: rem(12); font-size: rem(12);
float: right; float: right;
padding: 2.5px 13.5px 2.5px 13.5px; padding: 2.5px 13.5px 2.5px 13.5px;
color: #fff; color: black;
} }
} }
version/git-version.ts
+7 -7
View File
@@ -1,12 +1,12 @@
export let versionData = { export let versionData = {
"shortSHA": "a426fba4b", "shortSHA": "624d0b1d7",
"SHA": "a426fba4b3c63c23309cc9d377b733bd4fc775b2", "SHA": "624d0b1d7a142ec7b58756a9a023a650fdd2e952",
"branch": "developer-prod", "branch": "developer-prod",
"lastCommitAuthor": "'Peter Maquiran'", "lastCommitAuthor": "'Peter Maquiran'",
"lastCommitTime": "'Mon Aug 28 17:06:16 2023 +0100'", "lastCommitTime": "'Mon Aug 28 17:11:29 2023 +0100'",
"lastCommitMessage": "merge branch", "lastCommitMessage": "add gitignore",
"lastCommitNumber": "5221", "lastCommitNumber": "5222",
"change": "", "change": "diff --git a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss\nindex 3f911c5ce..4dbc4f087 100644\n--- a/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss\n+++ b/src/app/shared/gabinete-digital/diplomas/diplomas.page.scss\n@@ -170,7 +170,7 @@ ion-item{\n /* font-size: 12px; */\n float: right;\n padding: 2.5px 13.5px 2.5px 13.5px;\n- color: #fff;\n+ color: black;\n }\n }\n .exp-date{",
"changeStatus": "On branch developer-prod\nChanges to be committed:\n (use \"git restore --staged <file>...\" to unstage)\n\tmodified: .gitignore", "changeStatus": "On branch developer-prod\nAll conflicts fixed but you are still merging.\n (use \"git commit\" to conclude merge)\n\nChanges to be committed:\n\tmodified: src/app/modals/document-detail/document-detail.page.scss\n\tmodified: src/app/modals/view-event/view-event.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.html\n\tmodified: src/app/pages/agenda/agenda.page.scss\n\tmodified: src/app/pages/agenda/agenda.page.ts\n\tmodified: src/app/pages/agenda/view-event/view-event.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despacho-pr/despacho-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos-pr/despachos-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despacho/despacho.page.scss\n\tmodified: src/app/pages/gabinete-digital/despachos/despachos.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diploma-assinar/diploma-assinar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas-gerar/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified: src/app/pages/gabinete-digital/diplomas/diplomas.page.scss\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente-detail/expediente-detail.page.scss\n\tmodified: src/app/pages/gabinete-digital/expediente/expediente.page.scss\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expediente-pr/expediente-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/expedientes-pr/expedientes-pr.page.scss\n\tmodified: src/app/pages/gabinete-digital/gabinete-digital.page.scss\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedido/pedido.page.scss\n\tmodified: src/app/pages/gabinete-digital/pedidos/pedidos.page.scss\n\tmodified: src/app/pages/gabinete-digital/pendentes/pendentes.page.scss\n\tmodified: src/app/services/agenda/list-box.service.ts\n\tmodified: src/app/services/chat/message.service.ts\n\tmodified: src/app/shared/gabinete-digital/diplomas-assinar/diplomas-assinar.page.scss\n\tmodified: src/app/shared/gabinete-digital/diplomas-gerar/diplomas-gerar.page.scss\n\tmodified: src/app/shared/gabinete-digital/events-to-approve/events-to-approve.page.scss\n\tmodified: src/app/shared/gabinete-digital/expedientes-pr/expedientes-pr.page.scss\n\tmodified: src/app/shared/gabinete-digital/expedients/expedients.page.scss\n\tmodified: src/app/shared/gabinete-digital/generic/task-detail-content/task-detail-content.page.scss\n\tmodified: src/app/shared/gabinete-digital/generic/task-detail-header/task-detail-header.page.scss\n\tmodified: src/app/shared/gabinete-digital/generic/task-details/task-details.page.scss\n\tmodified: src/app/shared/gabinete-digital/pedidos/pedidos.page.scss\n\tmodified: src/app/shared/gabinete-digital/pendentes/pendentes.page.scss\n\tmodified: src/global.scss\n\tmodified: src/theme/variables.scss\n\tmodified: version/git-version.ts\n\nChanges not staged for commit:\n (use \"git add <file>...\" to update what will be committed)\n (use \"git restore <file>...\" to discard changes in working directory)\n\tmodified: src/app/shared/gabinete-digital/diplomas/diplomas.page.scss",
"changeAuthor": "peter.maquiran" "changeAuthor": "peter.maquiran"
} }