Skip to content

Fetching downstream changes #1040

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
renemadsen merged 3 commits into from
Sep 21, 2025
Merged

Fetching downstream changes #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8817a76
fixed mismatch between actual and planned value for flexbalance
masudul-tikweb Sep 17, 2025
5c41c0c
added g test to the workflows
masudul-tikweb Sep 18, 2025
a99a6a7
enable planned hours input when there is no data on the shift1
masudul-tikweb Sep 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-core-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
strategy:
fail-fast: false
matrix:
test: [a,b,c,d,e,f]
test: [a,b,c,d,e,f,g]
steps:
- uses: actions/checkout@v3
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dotnet-core-pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
strategy:
fail-fast: false
matrix:
test: [a,b,c,d,e,f]
test: [a,b,c,d,e,f,g]
steps:
- uses: actions/checkout@v3
with:
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,4 +351,6 @@ MigrationBackup/

eform-client/.idea/
/eFormAPI/eFormAPI.Web
.idea
.idea

.DS_Store
22 changes: 11 additions & 11 deletions eform-client/cypress/e2e/plugins/time-planning-pn/b/dashboard-edit-b.spec.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,13 +113,13 @@ const secondUpdatePlanTexts = [
];

const secondUpdateActualTexts = [
{ date: nextWeekDates[0], start1StartedAt: '07:30', stop1StoppedAt: '15:30', pause1Id: '00:25', start2StartedAt: '00:00', stop2StoppedAt: '00:00', pause2Id: '00:00', plannedHours: '8:00', flexBalanceToDate: 'swap_vert97.03', flexToDate: '97.45', flexIncludingToday: '97.03', nettoHours: '7.58', todaysFlex: '-0.42', paidOutFlex: 0, calculatedHours: '8' },
{ date: nextWeekDates[1], start1StartedAt: '07:50', stop1StoppedAt: '16:00', pause1Id: '01:00', start2StartedAt: '00:00', stop2StoppedAt: '00:00', pause2Id: '00:00', plannedHours: '8:00', flexBalanceToDate: 'swap_vert97.03', flexToDate: '97.03', flexIncludingToday: '97.03', nettoHours: '7.17', todaysFlex: '0.00', paidOutFlex: 0, calculatedHours: '7.166666666666667' },
{ date: nextWeekDates[0], start1StartedAt: '07:30', stop1StoppedAt: '15:30', pause1Id: '00:25', start2StartedAt: '', stop2StoppedAt: '', pause2Id: '', plannedHours: '8:00', flexBalanceToDate: 'swap_vert97.03', flexToDate: '97.45', flexIncludingToday: '97.03', nettoHours: '7.58', todaysFlex: '-0.42', paidOutFlex: 0, calculatedHours: '8' },
{ date: nextWeekDates[1], start1StartedAt: '07:50', stop1StoppedAt: '16:00', pause1Id: '01:00', start2StartedAt: '', stop2StoppedAt: '', pause2Id: '', plannedHours: '8:00', flexBalanceToDate: 'swap_vert97.03', flexToDate: '97.03', flexIncludingToday: '97.03', nettoHours: '7.17', todaysFlex: '0.00', paidOutFlex: 0, calculatedHours: '7.166666666666667' },
{ date: nextWeekDates[2], start1StartedAt: '07:15', stop1StoppedAt: '16:00', pause1Id: '01:00', start2StartedAt: '17:00', stop2StoppedAt: '20:00', pause2Id: '00:30', plannedHours: '8:00', flexBalanceToDate: 'swap_vert97.03', flexToDate: '97.03', flexIncludingToday: '97.03', nettoHours: '10.25', todaysFlex: '0.00', paidOutFlex: 0, calculatedHours: '10.25' },
{ date: nextWeekDates[3], start1StartedAt: '06:00', stop1StoppedAt: '12:00', pause1Id: '00:30', start2StartedAt: '18:00', stop2StoppedAt: '20:00', pause2Id: '00:30', plannedHours: '8:00', flexBalanceToDate: 'swap_vert97.03', flexToDate: '97.03', flexIncludingToday: '97.03', nettoHours: '7.00', todaysFlex: '0.00', paidOutFlex: 0, calculatedHours: '7' },
{ date: nextWeekDates[4], start1StartedAt: '06:00', stop1StoppedAt: '12:00' , pause1Id: '01:50' , start2StartedAt: '18:00' , stop2StoppedAt: '20:00' , pause2Id: '01:50' , plannedHours: '8.0' , flexBalanceToDate: 'swap_vert94.70' , flexToDate: '97.03' , flexIncludingToday: '94.70' , nettoHours: '4.33' , todaysFlex: '-2.33' , paidOutFlex : 0, calculatedHours : 6.666666666666667 },
{ date : nextWeekDates[5] , start1StartedAt : '00:00' , stop1StoppedAt : '00:00' , pause1Id : '00:00' , start2StartedAt : '00:00' , stop2StoppedAt : '00:00' , pause2Id : '00:00' , plannedHours : '' , flexBalanceToDate : 'swap_vert88.36' , flexToDate : '94.70' , flexIncludingToday : '88.36' , nettoHours : '0.00' , todaysFlex : '-6.33' , paidOutFlex : 0 , calculatedHours : 6.333333333333333 },
{ date : lastWeekDates[6] , start1StartedAt : '06:00' , stop1StoppedAt : '14:00' , pause1Id : '00:30' , start2StartedAt : '00:00' , stop2StoppedAt : '00:00' , pause2Id : '00:00' , plannedHours : '8:00' , flexBalanceToDate : 'swap_vert88.36' , flexToDate : '88.36' , flexIncludingToday : '88.36' , nettoHours : '7.50' , todaysFlex : '0.00' , paidOutFlex : 0 , calculatedHours : '7.5' }
{ date : nextWeekDates[5] , start1StartedAt : '' , stop1StoppedAt : '' , pause1Id : '' , start2StartedAt : '' , stop2StoppedAt : '' , pause2Id : '' , plannedHours : '' , flexBalanceToDate : 'swap_vert88.36' , flexToDate : '94.70' , flexIncludingToday : '88.36' , nettoHours : '0.00' , todaysFlex : '-6.33' , paidOutFlex : 0 , calculatedHours : 6.333333333333333 },
{ date : lastWeekDates[6] , start1StartedAt : '06:00' , stop1StoppedAt : '14:00' , pause1Id : '00:30' , start2StartedAt : '' , stop2StoppedAt : '' , pause2Id : '' , plannedHours : '8:00' , flexBalanceToDate : 'swap_vert88.36' , flexToDate : '88.36' , flexIncludingToday : '88.36' , nettoHours : '7.50' , todaysFlex : '0.00' , paidOutFlex : 0 , calculatedHours : '7.5' }
];

describe('Dashboard edit values', () => {
Expand All @@ -144,7 +144,7 @@ describe('Dashboard edit values', () => {
cy.get(cellId).click();
cy.get('#planHours').should('be.visible');

if (secondUpdateActualTexts[i].start1StartedAt !== '') {
if (secondUpdateActualTexts[i].start1StartedAt !== '' && secondUpdateActualTexts[i].start1StartedAt !== '00:00') {
cy.get(`#start1StartedAt`).click();
// eslint-disable-next-line max-len
let degrees0 = 360 / 12 * parseInt(secondUpdateActualTexts[i].start1StartedAt.split(':')[0]);
Expand All @@ -165,7 +165,7 @@ describe('Dashboard edit values', () => {
}
cy.get('#start1StartedAt').should('have.value', secondUpdateActualTexts[i].start1StartedAt);

if (secondUpdateActualTexts[i].stop1StoppedAt !== '') {
if (secondUpdateActualTexts[i].stop1StoppedAt !== '' && secondUpdateActualTexts[i].stop1StoppedAt !== '00:00') {
cy.get(`#stop1StoppedAt`).click();
// eslint-disable-next-line max-len
let degrees1 = 360 / 12 * parseInt(secondUpdateActualTexts[i].stop1StoppedAt.split(':')[0]);
Expand All @@ -189,7 +189,7 @@ describe('Dashboard edit values', () => {
}
cy.get('#stop1StoppedAt').should('have.value', secondUpdateActualTexts[i].stop1StoppedAt);

if (secondUpdateActualTexts[i].pause1Id !== '' || secondUpdateActualTexts[i].pause1Id !== '00:00') {
if (secondUpdateActualTexts[i].pause1Id !== '' && secondUpdateActualTexts[i].pause1Id !== '00:00') {
cy.get(`#pause1Id`).click();
// eslint-disable-next-line max-len
let degrees2 = 360 / 12 * parseInt(secondUpdateActualTexts[i].pause1Id.split(':')[0]);
Expand All @@ -212,10 +212,10 @@ describe('Dashboard edit values', () => {
cy.get('.timepicker-button span').contains('Ok').click();
cy.get('#pause1Id').should('have.value', secondUpdateActualTexts[i].pause1Id);
} else {
cy.get('#pause1Id').should('have.value', '00:00');
cy.get('#pause1Id').should('have.value', '');
}

if (secondUpdateActualTexts[i].start2StartedAt !== '' || secondUpdateActualTexts[i].start2StartedAt !== '00:00') {
if (secondUpdateActualTexts[i].start2StartedAt !== '' && secondUpdateActualTexts[i].start2StartedAt !== '00:00') {
cy.get(`#start2StartedAt`).click();
// eslint-disable-next-line max-len
let degrees3 = 360 / 12 * parseInt(secondUpdateActualTexts[i].start2StartedAt.split(':')[0]);
Expand All @@ -239,7 +239,7 @@ describe('Dashboard edit values', () => {
}
cy.get('#start2StartedAt').should('have.value', secondUpdateActualTexts[i].start2StartedAt);

if (secondUpdateActualTexts[i].stop2StoppedAt !== '' || secondUpdateActualTexts[i].stop2StoppedAt !== '00:00' ) {
if (secondUpdateActualTexts[i].stop2StoppedAt !== '' && secondUpdateActualTexts[i].stop2StoppedAt !== '00:00' ) {
cy.get(`#stop2StoppedAt`).click();
// eslint-disable-next-line max-len
let degrees4 = 360 / 12 * parseInt(secondUpdateActualTexts[i].stop2StoppedAt.split(':')[0]);
Expand All @@ -263,7 +263,7 @@ describe('Dashboard edit values', () => {
}
cy.get('#stop2StoppedAt').should('have.value', secondUpdateActualTexts[i].stop2StoppedAt);

if (secondUpdateActualTexts[i].pause2Id !== '' || secondUpdateActualTexts[i].pause2Id !== '00:00') {
if (secondUpdateActualTexts[i].pause2Id !== '' && secondUpdateActualTexts[i].pause2Id !== '00:00') {
cy.get(`#pause2Id`).click();
// eslint-disable-next-line max-len
let degrees5 = 360 / 12 * parseInt(secondUpdateActualTexts[i].pause2Id.split(':')[0]);
Expand Down
37 changes: 10 additions & 27 deletions eform-client/cypress/e2e/plugins/time-planning-pn/d/dashboard-edit-a.spec.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,33 +60,16 @@ describe('Dashboard edit values', () => {
afterEach(() => {
cy.get('#cell0_0').click();

cy.get('#plannedStartOfShift1')
.closest('.flex-row')
.find('button mat-icon')
.contains('delete')
.click({force: true});
cy.wait(500);

cy.get('#plannedEndOfShift1')
.closest('.flex-row')
.find('button mat-icon')
.contains('delete')
.click({force: true});
cy.wait(500);

cy.get('#start1StartedAt')
.closest('.flex-row')
.find('button mat-icon')
.contains('delete')
.click({force: true});
cy.wait(500);

cy.get('#stop1StoppedAt')
.closest('.flex-row')
.find('button mat-icon')
.contains('delete')
.click({force: true});
cy.wait(500);
['#plannedStartOfShift1', '#plannedEndOfShift1', '#start1StartedAt', '#stop1StoppedAt'].forEach(
(selector) => {
cy.get(selector)
.closest('.flex-row')
.find('button mat-icon')
.contains('delete')
.click({ force: true });
cy.wait(500);
}
);

cy.get('#saveButton').click();
cy.wait('@saveWorkdayEntity', {timeout: 60000});
Expand Down
37 changes: 10 additions & 27 deletions eform-client/cypress/e2e/plugins/time-planning-pn/e/dashboard-edit-a.spec.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,33 +62,16 @@ describe('Dashboard edit values', () => {
afterEach(() => {
cy.get('#cell0_0').click();

cy.get('#plannedStartOfShift1')
.closest('.flex-row')
.find('button mat-icon')
.contains('delete')
.click({force: true});
cy.wait(500);

cy.get('#plannedEndOfShift1')
.closest('.flex-row')
.find('button mat-icon')
.contains('delete')
.click({force: true});
cy.wait(500);

cy.get('#start1StartedAt')
.closest('.flex-row')
.find('button mat-icon')
.contains('delete')
.click({force: true});
cy.wait(500);

cy.get('#stop1StoppedAt')
.closest('.flex-row')
.find('button mat-icon')
.contains('delete')
.click({force: true});
cy.wait(500);
['#plannedStartOfShift1', '#plannedEndOfShift1', '#start1StartedAt', '#stop1StoppedAt'].forEach(
(selector) => {
cy.get(selector)
.closest('.flex-row')
.find('button mat-icon')
.contains('delete')
.click({ force: true });
cy.wait(500);
}
);

cy.get('#saveButton').click();
cy.wait('@saveWorkdayEntity', {timeout: 60000});
Expand Down
39 changes: 11 additions & 28 deletions eform-client/cypress/e2e/plugins/time-planning-pn/f/dashboard-edit-a.spec.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,16 @@ describe('Dashboard edit values', () => {
cy.get('.ng-option').contains('ac ad').click();
cy.get('#cell0_0').click();

cy.get('#plannedStartOfShift1')
.closest('.flex-row')
.find('button mat-icon')
.contains('delete')
.click({force: true});
cy.wait(500);

cy.get('#plannedEndOfShift1')
.closest('.flex-row')
.find('button mat-icon')
.contains('delete')
.click({force: true});
cy.wait(500);

cy.get('#start1StartedAt')
.closest('.flex-row')
.find('button mat-icon')
.contains('delete')
.click({force: true});
cy.wait(500);

cy.get('#stop1StoppedAt')
.closest('.flex-row')
.find('button mat-icon')
.contains('delete')
.click({force: true});
cy.wait(500);
['#plannedStartOfShift1', '#plannedEndOfShift1', '#start1StartedAt', '#stop1StoppedAt'].forEach(
(selector) => {
cy.get(selector)
.closest('.flex-row')
.find('button mat-icon')
.contains('delete')
.click({ force: true });
cy.wait(500);
}
);
});

// Set a timepicker value
Expand Down Expand Up @@ -73,8 +56,8 @@ describe('Dashboard edit values', () => {

it('should show an error when planned break is longer than the shift duration', () => {
setTimepickerValue('#plannedStartOfShift1', '1', '00');
setTimepickerValue('#plannedBreakOfShift1', '9', '00');
setTimepickerValue('#plannedEndOfShift1', '10', '00');
setTimepickerValue('#plannedBreakOfShift1', '9', '00');
assertInputError('plannedBreakOfShift1-Error', 'Break cannot be equal or longer than shift duration');
});

Expand Down
Loading
Loading