update dashboard and added dockerfiles

Dockerfile

@@ -0,0 +1,19 @@
+FROM python:3.11
+
+WORKDIR /app
+
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    python3-gdal \
+    libgdal-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY . .
+
+RUN pip3 install -r requirements.txt
+
+EXPOSE 8501
+
+HEALTHCHECK CMD curl --fail http://localhost:8501/_stcore/health
+
+ENTRYPOINT ["streamlit", "run", "wim.py", "--server.port=8501", "--server.address=0.0.0.0"]

docker-compose.yml

@@ -0,0 +1,9 @@
+version: '2'
+services:
+
+  web:
+    build: .
+    ports:
+      - 8501:8501
+    volumes:
+      - .:/app

functions.py

@@ -151,34 +151,20 @@ def read_user_data(username):
 
     # Define the file path based on the username
 
-    pickle_file = f"./input_employees/{username}.pkl"
+    csv_file = f"./input_employees/{username}.csv"
 
 
 
     # Check if the file exists
 
-    if os.path.exists(pickle_file):
-
-        with open(pickle_file, 'rb') as f:
-
-            user_data = pickle.load(f)
-
+    if os.path.exists(csv_file):
 
 
-        # Convert the stored weeks data into a DataFrame
 
-        if 'weeks' in user_data:
+        user_data = pd.read_csv(csv_file)
 
-            df = pd.DataFrame.from_dict(user_data['weeks'], orient='index').reset_index()
-
-            df.columns = ['week', 'druk', 'note']  # Rename columns
-
-            return df
-
-        else:
-
-            return pd.DataFrame(columns=['week', 'druk', 'note'])  # Return empty DataFrame if no weeks data
 
+        return user_data
 
 
     else:
@@ -190,6 +176,7 @@ def read_user_data(username):
 # checks all employees files based on list of employees and creates for selected week overview of work pressure of each employee
 # if employee didn't fill form for selected week, it will be listed as bad_employee and shamed in dashboard
 def create_week_planning_team(week_number, employees_list):
+    print(week_number)
     df_current_week = pd.DataFrame(columns=['name', 'druk', 'note', 'color'])
     good_employees = []
     bad_employees = []
@@ -200,7 +187,6 @@ def create_week_planning_team(week_number, employees_list):
 
         # check if it is filled in
         filled_in = planning_employee_cw['druk'].isin(['Afwezig', 'Heel Rustig', 'Rustig', 'Goed', 'Druk', 'Heel druk']).any()
-
 
         if filled_in == True:
             good_employees += [employee]

input_employees/esther.csv

@@ -1,13 +1,13 @@
-week,druk,note
+week,druk,note
 37,druk,hallo
 38,heel rustig,yooo
 39,goed,doei
 40,,
 41,,
 42,,
 43,,
-44,,
-45,,
+44, Druk,wimmm
+45,Goed,lekker werken
 46,,
 47,,
 48,,

wim.py

@@ -92,7 +92,7 @@
         if submitted:
             selected_category = selected_category[2:]
             print(selected_category)
-            update_user_data(username, week_numbers, selected_category, notes)
+            update_user_csv(username, week_numbers, selected_category, notes)
 
 
 elif nav == 'overzicht':
@@ -130,7 +130,9 @@
     import datetime
     with tab1:
         current_week_number = datetime.datetime.now().isocalendar()[1]
+
         current_week_planning, bad_employees = create_week_planning_team(current_week_number, employees_list)
+        #print(current_week_planning)
         graph_current_week = create_overview_graph(current_week_planning, current_week_number)
 
         # place graphic on right spot