From 52d85e96c9a97bb3028a7b3e909fd32ca21d4836 Mon Sep 17 00:00:00 2001
From: Michiel de Jong <michiel@pondersource.com>
Date: Mon, 4 Dec 2023 12:52:59 +0100
Subject: [PATCH] Count days spent so far

---
 admin/days-worked.md | 84 ++++++++++++++++++++------------------------
 1 file changed, 39 insertions(+), 45 deletions(-)

diff --git a/admin/days-worked.md b/admin/days-worked.md
index 2d73b1e..8d03e25 100644
--- a/admin/days-worked.md
+++ b/admin/days-worked.md
@@ -1,46 +1,40 @@
 Activities in the Solid Data Modules project
-## M1 (bookmarks)
-### Reza
-Week of 27 Nov: 5 days
-
-#### Getting up to speed with Solid app development
-Days: 20
-
-#### Bookmarks app using Inrupt client
-Live: https://bookmarks.pondersource.net/
-Code: https://github.com/pondersource/solidBookmarker
-Days: 10
-
-#### Profile Editor app using Inrupt client
-Live: https://profile.pondersource.net/
-Code: https://github.com/pondersource/solidProfileEditor
-Days: 10
-
-#### Bookmarks app using remoteStorage
-Live: https://rs-bookmarks.pondersource.net
-Code: https://github.com/pondersource/rs_bookmarks
-Days: 5
-
-### Yashar
-Week of 27 Nov: .5 days
-
-## E2 (Solid Slack Bridge)
-Presentation: https://www.youtube.com/watch?v=Pd5joZkr5S4
-Code: https://github.com/pondersource/solid-slack-bridge
-Days Reza: 12
-Days Yashar: 12
-
-## P2 (Soukai Data Modules)
-Code: https://github.com/pondersource/soukai-solid-data-modules
-Days Reza: full-time since 1 Oct
-
-## F2 (Solid backend for remoteStorage.js)
-Days Yashar in October: 6
-### RemoteStorageJS
-Code: https://github.com/pondersource/remotestorage.js
-### Widget
-Code: https://github.com/pondersource/remotestorage-widget/
-
-## M2 (Contacts Module for rdflib.js)
-Code: https://github.com/solid-contrib/data-modules/tree/contacts/contacts
-Days Angelo: 2
+
+From 17 July to 3 December Reza worked 100 days on M1:bookmarks, E1:Soukai-Solid, and E2:Slack-bridge.
+Let's account 15 days to E2 Slack bridge, 65 days to M1 bookmarks, and 20 days to E1:Soukai-Solid.
+
+Yashar worked 0.5 days on M1:bookmarks, 15 days on E2:Slack-bridge, and 6 days on F2:rs.js-backend.
+
+Milestones that are underway as of 4 December:
+
+# M1 Bookmarks
+* Reza: 65
+* Yashar: 0.5
+
+FIXME: Increase budget from 3k to 6k
+Budget: `6000-(65*80 + .5*80)=760`
+
+# M2 Contacts1
+* Angelo: 2
+
+Budget: `2000-(2*500)=1000`
+
+# P1 Soukai-Solid
+* Reza: 20
+
+Budget: `3000-(20*80)=1400`
+
+# E2 Solid Slack Bridge
+* Reza: 15
+* Yashar: 15
+
+FIXME: Increase budget from 2k to 3k
+Budget: `3000-(15*80+15*80)=600`
+
+# E3 (Solid library for Java-Android)
+
+* Erfan has worked 30 hours a week @ 500 eur / month, starting 1 November, so this milestone is due 31 December
+
+# E7 (Conventions Archive)
+
+* Rosano works 1 day per week on this, for 4 weeks (24 Nov, 1 Dec, 8 Dec, 15 Dec)