Skip to content
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.

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

Achille/dev 0.0.27 #33

Merged
merged 5 commits into from
May 16, 2023
Merged

Achille/dev 0.0.27 #33

merged 5 commits into from
May 16, 2023

Conversation

AchilleBailly
Copy link
Collaborator

@AchilleBailly AchilleBailly commented Dec 2, 2022

New Feature

Added a form directly in WAI to create events automatically, formatted just as needed.

HR Summary

  • Fixed the total count in the HRSummary table.
  • Used the ALLOWED_PLACES list to fill the header of the table instead of the temporary hardcoded values.
  • Changed the default dates to first and last day of the current month.
  • Added buttons to go backward or forward 1 month

Refactor

  • Moved some hard coded strings into a config file as const (table names, selectors ...)
  • Same with utils functions

use DateTime;
use Exception;
use OCP\AppFramework\Http;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unused Imports

$sql = 'SELECT * FROM `*PREFIX*calendars` WHERE `*PREFIX*calendars`.principaluri = ?';
return $this->execSQLNoJsonReturn($sql, array($principalUri));
}

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SQL query to get the calendars that belong to the user. Used to select the calendar when adding a new event with the new form.

if (dtEnd > periodEnd)
dtEnd = periodEnd


Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix to the total count : used to add the full length of an event when the event started in the period but ended after (or the opposit)

charactersLength));
}
return result;
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved to utils.js

'Astreinte',
'Férié',
'Total'
]
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No more hard coded values (except first and last columns)

}
}
oReq.send(data)
return oReq;
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

New XHR functions used in the new form

@baimard baimard merged commit d8394b1 into main May 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants