diff --git a/assets/images/contract.png b/assets/images/contract.png new file mode 100644 index 00000000..1c3396cc Binary files /dev/null and b/assets/images/contract.png differ diff --git a/assets/images/contract2.png b/assets/images/contract2.png new file mode 100644 index 00000000..792a4f4e Binary files /dev/null and b/assets/images/contract2.png differ diff --git a/assets/images/hours-description.png b/assets/images/hours-description.png new file mode 100644 index 00000000..555620e5 Binary files /dev/null and b/assets/images/hours-description.png differ diff --git a/assets/images/plus-button.png b/assets/images/plus-button.png new file mode 100644 index 00000000..a4405490 Binary files /dev/null and b/assets/images/plus-button.png differ diff --git a/components/end-of-life.vue b/components/end-of-life.vue index 45c8b6d8..7a765153 100644 --- a/components/end-of-life.vue +++ b/components/end-of-life.vue @@ -2,22 +2,137 @@

We're moving to time writing in Bridge!

- The last couple of months the bridge team added multiple features to time writing in Bridge - which makes it suitable for us. + Did you know the hours tool already syncs to Bridge and is just an interface on top of it? + Well, the tooling team took great effort in adjusting Bridge to accommodate the way we write + our hours like we do by introducing the new Grid view.

That's why, starting April, we all will use Bridge for time writing.

Use these contract names to find the right items to write hours in Bridge:

- + + + Start writing hours in Bridge +
+

How to write hours

+

Go to either one of:

+ + + Grid view instructions: +
    +
  1. +

    + Click the + button. +
    + Plus Button +

    +
    2. +
  2. +

    + Select the correct contract +
    + Contract +

    +
    3. +
  3. +

    + Click save (and close modal) or click save & new (to add another contract) +
    + Contract +

    +
    4. +
  4. +

    + Write hours & enter a description. +
    + Hours and Description +

    +
    + ⚠️ Descriptions will show on the invoice of the client. +
    + Please use something like “ + Client work + ” as the description. +
    +
    5. +
  5. +

    Done!

    +

    + For full details, check out Confluence: + + Grid based week calendar + +

    +
    6. +
+

Guidelines

+

+ +

Tips

+

+ You can copy/paste time entries in both calendar and grid view. First copy the entry, by + clicking the copy button or selecting the card and cmd + c / ctrl + c. Paste the entry, by + clicking the paste button or selecting the day row and cmd + v / ctrl + v. +

+

+ You can check if you booked correct or still have to write or quick select a certain week by + clicking on the date period. You can change the order of the grid rows by dragging and + dropping using the 3 lines. You can also unpin by clicking the red pin or pin by clicking the + grey pin. +

@@ -33,12 +148,32 @@ export default defineComponent({ const store = useStore(); const timesheet = computed(() => store.state.timesheets.weeklyTimesheet); - const contracts = computed(() => timesheet.value.projects.map((project) => project.project.contract)); + + // Filter first on empty contracts, because they could be empty which leads to an error + // Also ignore the 'Intracto - INTERN - Consultancy NL non-billable' contract, because it's not relevant in the new situation + const assignedContracts = computed(() => timesheet.value.projects.map((project) => project.project.contract).filter(Boolean).filter((contract) => contract?.project_id !== 9322)); + const staticContracts = computed(() => [ + { name: 'Google Day', project_name: 'iO - Consultancy > NL - Campus Initiatives (IOC_0003#1) > Google Days', pinlink: 'https://bridge.hosted-tools.com/worklogs/calendar/grid/pin?logEntityIdToPin=f1bf93ac-d70e-11ee-9590-00505697992f'}, + { name: 'Team Captain (when assigned)', project_name: 'iO > Coaching > Giving coaching (not client related)', pinlink: 'https://bridge.hosted-tools.com/worklogs/calendar/grid/pin?logEntityIdToPin=c84ddf11-39e0-11ed-890c-005056bfa842' }, + { name: 'Developer Advocate (when assigned)', project_name: 'CoE > (CNLDA#1) Consultancy NL - Developer Advocacy', pinlink: 'https://bridge.hosted-tools.com/worklogs/calendar/grid/pin?logEntityIdToPin=7138f7e7-4358-11ee-a749-00505697992f' }, + { name: 'Available or Other', project_name: 'Check-in with your manager where to write this in Bridge' }, + ]); return { - fields: [{ key: 'name', label: 'Contract' }, { key: 'project_name', label: 'Project' }], - contracts, + fields: [{ key: 'name', label: 'Time entry' }, { key: 'project_name', label: 'Contract' }, { key: 'pinlink', label: 'Bridge link' }], + contracts: [...assignedContracts.value, ...staticContracts.value], }; }, }); +