Skip to content

Commit

Permalink
Montag 11:00
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter Hornburger committed Aug 26, 2024
1 parent 526a0bc commit b0841a8
Show file tree
Hide file tree
Showing 6 changed files with 82 additions and 36 deletions.
45 changes: 28 additions & 17 deletions src/app/app.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,34 +88,45 @@ export class AppComponent implements OnInit, OnDestroy, AfterContentChecked {

if(this.AuthService.SecurityEnabled) {

this.authService.initialize().subscribe(() => {
try {

this.msalBroadcastService.inProgress$
.pipe(
filter((status_a: InteractionStatus) => {
this.authService.initialize().subscribe(() => {

this.Debug.ShowMessage('Interaction Status: ' + status_a, 'App Component', 'StartApp', this.Debug.Typen.Component);
this.msalBroadcastService.inProgress$
.pipe(
filter((status_a: InteractionStatus) => {

return status_a === InteractionStatus.None;
}),
takeUntil(this.Destroying)
)
.subscribe((status_b: InteractionStatus) => {
this.Debug.ShowMessage('Interaction Status: ' + status_a, 'App Component', 'StartApp', this.Debug.Typen.Component);

this.Debug.ShowMessage('Interaction Status: ' + status_b, 'App Component', 'StartApp', this.Debug.Typen.Component);
return status_a === InteractionStatus.None;
}),
takeUntil(this.Destroying)
)
.subscribe((status_b: InteractionStatus) => {

this.AuthService.SetShowLoginStatus();
});
this.Debug.ShowMessage('Interaction Status: ' + status_b, 'App Component', 'StartApp', this.Debug.Typen.Component);

this.AuthService.SetShowLoginStatus();
});

this.AuthService.LoginSuccessEvent.subscribe(() => {

this.AuthService.LoginSuccessEvent.subscribe(() => {
this.Debug.ShowMessage('LoginSuccessEvent -> Start App', 'App Component', 'StartApp', this.Debug.Typen.Component);

this.Debug.ShowMessage('LoginSuccessEvent -> Start App', 'App Component', 'StartApp', this.Debug.Typen.Component);
this.StartApp();
});

this.StartApp();
});

this.StartApp();
});
} catch (error) {

this.AuthService.UnsetActiveUser();

this.Debug.ShowErrorMessage(error, 'App Component', 'OnInit', this.Debug.Typen.Component);
}


}
else {

Expand Down
14 changes: 14 additions & 0 deletions src/app/components/pj-urlaubsplanung-kalender/urlausplanung-kalender.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,7 @@ export class UrlaubsplanungKalenderComponent implements OnInit, OnDestroy, OnCha
try {

let EndeDatum: Moment;
let Datum: Moment;
let Startdatum: Moment;
let Kalendertag: Kalendertagestruktur;
let Anzahl: number = 0 ;
Expand Down Expand Up @@ -721,6 +722,19 @@ export class UrlaubsplanungKalenderComponent implements OnInit, OnDestroy, OnCha
Kalendertag.IsHalberUrlaubstag = true;
Kalendertag.Color = 'white';

Datum = moment(Tag.Tagstempel);

if(Datum.isSameOrBefore(Heute)) {

this.DB.CurrentUrlaubzeitspanne.Status = this.DB.Urlaubstatusvarianten.Genehmigt;
this.DB.CurrentUrlaubzeitspanne.FreigabeanfrageSended = true;
this.DB.CurrentUrlaubzeitspanne.FreigabeantwortSended = true;
this.DB.CurrentUrlaubzeitspanne.FreigabeantwortOfficeSended = true;
this.DB.CurrentUrlaubzeitspanne.Planungmeldung = 'Der Urlaub befand sich zum Tage der Eintragung am ' + Heute.format('DD.MM.YYYY') + ' in der Vergangenheit.';

Kalendertag.Background = this.DB.Urlaubsfaben.Genehmigt;
}


this.AddUrlaubFinishedEvent.emit(true);

Expand Down
4 changes: 4 additions & 0 deletions src/app/pages/common-urlaub-planung/common-urlaub-planung.page.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,10 @@ export class CommonUrlaubPlanungPage implements OnInit, OnDestroy {

this.DB.Bundesland = lodash.find(this.BundeslandAuswahlliste, {Data: this.DB.Bundeslandkuerzel}).FirstColumn;

let test = this.DB.CurrentUrlaub.Urlaubzeitspannen;

debugger;

} catch (error) {

this.Debug.ShowErrorMessage(error, 'Urlaubsplanung Page', 'PrepareData', this.Debug.Typen.Page);
Expand Down
6 changes: 3 additions & 3 deletions src/app/services/basics/basics.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ export class BasicsProvider {
public InnerContenthoehe: number = 0;
public Waittime: number = 300;
public Svgpath: string = 'assets/svgs/';
public AppBuild: string = '05.06.2024 07:00';
public AppVersionName: string = '1.19';
public AppVersionDatum: string = '05.06.2024';
public AppBuild: string = '26.08.2024 07:00';
public AppVersionName: string = '1.20';
public AppVersionDatum: string = '26.08.2024';
public WebAppUrl: string = 'https://polite-cliff-084832d03.4.azurestaticapps.net/';


Expand Down
47 changes: 32 additions & 15 deletions www/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,20 +166,25 @@ let AppComponent = class AppComponent {
this.Zoomfaktor = this.Pool.Mitarbeitersettings.Zoomfaktor;
});
if (this.AuthService.SecurityEnabled) {
this.authService.initialize().subscribe(() => {
this.msalBroadcastService.inProgress$.pipe((0, rxjs_1.filter)(status_a => {
this.Debug.ShowMessage('Interaction Status: ' + status_a, 'App Component', 'StartApp', this.Debug.Typen.Component);
return status_a === msal_browser_1.InteractionStatus.None;
}), (0, rxjs_1.takeUntil)(this.Destroying)).subscribe(status_b => {
this.Debug.ShowMessage('Interaction Status: ' + status_b, 'App Component', 'StartApp', this.Debug.Typen.Component);
this.AuthService.SetShowLoginStatus();
});
this.AuthService.LoginSuccessEvent.subscribe(() => {
this.Debug.ShowMessage('LoginSuccessEvent -> Start App', 'App Component', 'StartApp', this.Debug.Typen.Component);
try {
this.authService.initialize().subscribe(() => {
this.msalBroadcastService.inProgress$.pipe((0, rxjs_1.filter)(status_a => {
this.Debug.ShowMessage('Interaction Status: ' + status_a, 'App Component', 'StartApp', this.Debug.Typen.Component);
return status_a === msal_browser_1.InteractionStatus.None;
}), (0, rxjs_1.takeUntil)(this.Destroying)).subscribe(status_b => {
this.Debug.ShowMessage('Interaction Status: ' + status_b, 'App Component', 'StartApp', this.Debug.Typen.Component);
this.AuthService.SetShowLoginStatus();
});
this.AuthService.LoginSuccessEvent.subscribe(() => {
this.Debug.ShowMessage('LoginSuccessEvent -> Start App', 'App Component', 'StartApp', this.Debug.Typen.Component);
this.StartApp();
});
this.StartApp();
});
this.StartApp();
});
} catch (error) {
this.AuthService.UnsetActiveUser();
this.Debug.ShowErrorMessage(error, 'App Component', 'OnInit', this.Debug.Typen.Component);
}
} else {
this.StartApp();
}
Expand Down Expand Up @@ -5502,6 +5507,7 @@ let UrlaubsplanungKalenderComponent = class UrlaubsplanungKalenderComponent {
TagClicked(event, Tag, Wocheindex, CurrentTagindex) {
try {
let EndeDatum;
let Datum;
let Startdatum;
let Kalendertag;
let Anzahl = 0;
Expand Down Expand Up @@ -5611,6 +5617,15 @@ let UrlaubsplanungKalenderComponent = class UrlaubsplanungKalenderComponent {
Kalendertag.IsUrlaub = true;
Kalendertag.IsHalberUrlaubstag = true;
Kalendertag.Color = 'white';
Datum = (0, moment_1.default)(Tag.Tagstempel);
if (Datum.isSameOrBefore(Heute)) {
this.DB.CurrentUrlaubzeitspanne.Status = this.DB.Urlaubstatusvarianten.Genehmigt;
this.DB.CurrentUrlaubzeitspanne.FreigabeanfrageSended = true;
this.DB.CurrentUrlaubzeitspanne.FreigabeantwortSended = true;
this.DB.CurrentUrlaubzeitspanne.FreigabeantwortOfficeSended = true;
this.DB.CurrentUrlaubzeitspanne.Planungmeldung = 'Der Urlaub befand sich zum Tage der Eintragung am ' + Heute.format('DD.MM.YYYY') + ' in der Vergangenheit.';
Kalendertag.Background = this.DB.Urlaubsfaben.Genehmigt;
}
this.AddUrlaubFinishedEvent.emit(true);
} else {
if (IsFeiertag) this.Tools.ShowHinweisDialog('Dieser Tag ist ein Feiertag.');else if (IsUrlaub) this.Tools.ShowHinweisDialog('Dieser Tag ist ein Urlaubstag.');else this.Tools.ShowHinweisDialog('Dieser Tag ist bereits ein Homeofficetag.');
Expand Down Expand Up @@ -8762,6 +8777,8 @@ let CommonUrlaubPlanungPage = class CommonUrlaubPlanungPage {
_this2.DB.Bundesland = lodash.find(_this2.BundeslandAuswahlliste, {
Data: _this2.DB.Bundeslandkuerzel
}).FirstColumn;
let test = _this2.DB.CurrentUrlaub.Urlaubzeitspannen;
debugger;
} catch (error) {
_this2.Debug.ShowErrorMessage(error, 'Urlaubsplanung Page', 'PrepareData', _this2.Debug.Typen.Page);
}
Expand Down Expand Up @@ -11476,9 +11493,9 @@ let BasicsProvider = class BasicsProvider {
InnerContenthoehe = 0;
Waittime = 300;
Svgpath = 'assets/svgs/';
AppBuild = '05.06.2024 07:00';
AppVersionName = '1.19';
AppVersionDatum = '05.06.2024';
AppBuild = '26.08.2024 07:00';
AppVersionName = '1.20';
AppVersionDatum = '26.08.2024';
WebAppUrl = 'https://polite-cliff-084832d03.4.azurestaticapps.net/';
Farben = {
BAEBlau: '#307ac1',
Expand Down
2 changes: 1 addition & 1 deletion www/main.js.map
View file

Large diffs are not rendered by default.

0 comments on commit b0841a8

Please sign in to comment.