From 35ef43dc1bf756d04c502cc2b9c57168270da928 Mon Sep 17 00:00:00 2001 From: Zarquan Date: Fri, 19 Jan 2024 13:11:30 +0000 Subject: [PATCH] Notes on holiday dates for 2023-2024 --- notes/zrq/20240119-01-holidays.txt | 125 +++++++++++++++++++++++++++ notes/zrq/20240119-02-git-branch.txt | 54 ++++++++++++ 2 files changed, 179 insertions(+) create mode 100644 notes/zrq/20240119-01-holidays.txt create mode 100644 notes/zrq/20240119-02-git-branch.txt diff --git a/notes/zrq/20240119-01-holidays.txt b/notes/zrq/20240119-01-holidays.txt new file mode 100644 index 00000000..f9026b01 --- /dev/null +++ b/notes/zrq/20240119-01-holidays.txt @@ -0,0 +1,125 @@ +# +# +# +# Copyright (c) 2024, ROE (http://www.roe.ac.uk/) +# +# This information is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This information is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# +# +#zrq-notes-time +#zrq-notes-indent +#zrq-notes-crypto +#zrq-notes-ansible +#zrq-notes-osformat +#zrq-notes-zeppelin +# +# AIMetrics: [] +# + + Target: + + Checking the holiday days for 2023. + People&Money says I took 14 more hours than I should have. + + Result: + + Yep, adding it all up I used 14 more hours than I should have. + + The multi-million pound accounting system allowed me to book 14 more hours than I should have. + Post Office Horizon ?! + + +# ----------------------------------------------------- + + Adding up the entries for 2023. + + Leave: 7 Hours 29/12/2023-29/12/2023 + Leave: 7 Hours 28/12/2023-28/12/2023 + Leave: 7 Hours 27/12/2023-27/12/2023 + Leave: 7 Hours 26/12/2023-26/12/2023 + Leave: 7 Hours 25/12/2023-25/12/2023 + Leave: 7 Hours 22/12/2023-22/12/2023 + Leave: 84 Hours 6/12/2023-21/12/2023 + Leave: 7 Hours 1/12/2023-1/12/2023 + Leave: 7 Hours 17/11/2023-17/11/2023 + Leave: 7 Hours 15/11/2023-15/11/2023 + Leave: 70 Hours 1/11/2023-14/11/2023 + Leave: 7 Hours 23/10/2023-23/10/2023 + Leave: 7 Hours 5/10/2023-5/10/2023 + Leave: 7 Hours 20/09/2023-20/09/2023 + Leave: 7 Hours 1/09/2023-1/09/2023 + Leave: 35 Hours 31/07/2023-4/08/2023 + Leave: 7 Hours 14/07/2023-14/07/2023 + Leave: 14 Hours 29/06/2023-30/06/2023 + Leave: 7 Hours 3/01/2023-3/01/2023 + Leave: 7 Hours 2/01/2023-2/01/2023 + + 84+70+35+14+(16 * 7)=315 + +# ----------------------------------------------------- + + According to People&Money .. + + Carryover 35 + Accruals 287 + Absences -315 + Expiration -21 + --------------- + Balance -14 + +# ----------------------------------------------------- + +Hi Leigh, + +Going back through my calendar I did indeed take 315 hours in 2023. + +My recolection is I used the available balance from People&Money to book the dates for November and December. +I assumed the time remaining People&Money showed me was correct, so I booked holiday to use it. + +However, it is quite common for our team to work weekends and public holidays. + +For example, People&Money automatically allocated Tue 02 Jan 2024 as a holiday, +but the GitHub logs for our project show that I was working. + + Tue 02 Jan 2024 2:21pm + https://github.com/wfau/gaia-dmp/commit/8cbef6ebd2d77a59adbb5b2b4d827755edaaf965 + +I didn't request Tue 02 Jan 2024 as a holiday and I didn't realise that +People&Money was counting it as such. + +Can you please delete the holiday entry for Tue 02 Jan 2024 and +use the hours to create a new entry for Mon 04 Mar 2024. + +Many thanks, +-- Dave + + +# ----------------------------------------------------- + +Unused examples in December : + +The logs for our GitHub project shows I worked on our project +on Sat 30 Dec 2023, and Sun 31 Dec 2023. + + Sat 30 Dec 2023 3:08pm + https://github.com/wfau/gaia-dmp/commit/aa68c604b4b2929ed57791d23a80f23af4db2089 + + Sun 31 Dec 2023 5:53am + https://github.com/wfau/gaia-dmp/commit/076a86adc32534135d3b19fc1bada3a43b554d1c + + + + + diff --git a/notes/zrq/20240119-02-git-branch.txt b/notes/zrq/20240119-02-git-branch.txt new file mode 100644 index 00000000..74f6fb9d --- /dev/null +++ b/notes/zrq/20240119-02-git-branch.txt @@ -0,0 +1,54 @@ + +# ----------------------------------------------------- +# Start a new branch. +#[user@desktop] + + branchname=holiday-dates + + source "${HOME:?}/aglais.env" + pushd "${AGLAIS_CODE}" + + newbranch=$(date '+%Y%m%d')-zrq-${branchname:?} + + git checkout master + + git checkout -b "${newbranch:?}" + + git add . + git commit -m 'Notes on holiday dates for 2023-2024' + + git push --set-upstream 'origin' "$(git branch --show-current)" + + popd + + +# ----------------------------------------------------- +# Merge changes on GitHub. +#[user@desktop] + + .... + .... + +# ----------------------------------------------------- +# Merge upstream changes. +#[user@desktop] + + source "${HOME:?}/aglais.env" + pushd "${AGLAIS_CODE}" + + git checkout master + + git pull + + git fetch upstream + + git merge upstream/master + + git status + + git push + + popd + + +