Update app.py

app.py

@@ -30,6 +30,7 @@ def process_data(file: gr.File, progress=gr.Progress()) -> Tuple[str, str, pd.Da
             raise ValueError(f"Error reading Excel file: {str(e)}")
 
         base_path = tempfile.mkdtemp()
+        mailmerge_path = os.path.join('mailmerge')
         final_file_path = os.path.join(base_path, 'final_output.xlsx')
 
         # Step 1: Extract User Information
@@ -56,7 +57,7 @@ def process_data(file: gr.File, progress=gr.Progress()) -> Tuple[str, str, pd.Da
 
         # Step 4: Generate Filenames and Paths
         user_info['File'] = 'User_' + user_info['Username'] + '_data.csv'
-        user_info['Path'] = user_info['File'].apply(lambda x: os.path.join(base_path, 'mailmerge', x))
+        user_info['Path'] = user_info['File'].apply(lambda x: os.path.join(mailmerge_path, x))
 
         # Remove extra columns and summary rows
         user_info = user_info[['Username', 'Name', 'Courses', 'Grand Total', 'Email', 'File', 'Path']]
@@ -72,13 +73,13 @@ def process_data(file: gr.File, progress=gr.Progress()) -> Tuple[str, str, pd.Da
 
         # Generate individual CSV files for each user
         required_columns = ['course_id', 'course_pk1', 'data', 'event_type', 'internal_handle', 'lastname', 'session_id', 'timestamp', 'user_id', 'system_role']
-        mailmerge_path = os.path.join(base_path, 'mailmerge')
-        if not os.path.exists(mailmerge_path):
-            os.makedirs(mailmerge_path)
+        full_mailmerge_path = os.path.join(base_path, mailmerge_path)
+        if not os.path.exists(full_mailmerge_path):
+            os.makedirs(full_mailmerge_path)
         
         for user_id in user_info['Username'].unique():
             user_data = raw_data[raw_data['user_id'] == user_id][required_columns]
-            user_file_path = os.path.join(mailmerge_path, f'User_{user_id}_data.csv')
+            user_file_path = os.path.join(full_mailmerge_path, f'User_{user_id}_data.csv')
             user_data.to_csv(user_file_path, index=False)
 
         # Save the final dataframe to the output Excel file
@@ -98,10 +99,11 @@ def process_data(file: gr.File, progress=gr.Progress()) -> Tuple[str, str, pd.Da
         # Create a zip file containing all user CSV files and the final Excel file
         zip_buffer = io.BytesIO()
         with zipfile.ZipFile(zip_buffer, 'w', zipfile.ZIP_DEFLATED) as zip_file:
-            for root, _, files in os.walk(mailmerge_path):
+            for root, _, files in os.walk(full_mailmerge_path):
                 for file in files:
                     file_path = os.path.join(root, file)
-                    zip_file.write(file_path, os.path.relpath(file_path, base_path))
+                    arcname = os.path.relpath(file_path, base_path)
+                    zip_file.write(file_path, arcname)
 
             zip_file.write(final_file_path, os.path.basename(final_file_path))
 
@@ -139,6 +141,7 @@ def create_bar_chart(df: pd.DataFrame, x: str, y: str, title: str) -> Union[px.b
             paper_bgcolor='white',
             font_color=NTU_BLUE
         )
+        fig.update_xaxes(tickmode='linear')  # Ensure all x-axis labels are shown
         fig.update_traces(marker_color=NTU_BLUE)
         return fig
     except Exception as e:
@@ -156,6 +159,7 @@ def create_scatter_plot(df: pd.DataFrame) -> Union[px.scatter, None]:
             paper_bgcolor='white',
             font_color=NTU_BLUE
         )
+        fig.update_xaxes(tickmode='linear')  # Ensure all x-axis labels are shown
         fig.update_traces(marker_color=NTU_RED)
         return fig
     except Exception as e:
@@ -214,7 +218,40 @@ custom_theme = gr.themes.Base().set(
     input_border_color_focus="#C11E38",
 )
 
-with gr.Blocks(theme=custom_theme, css="custom.css") as iface:
+# Custom CSS
+custom_css = """
+.gr-button-secondary {
+    background-color: #F0F0F0;
+    color: #003D7C;
+    border: 1px solid #003D7C;
+    border-radius: 12px;
+    padding: 8px 16px;
+    font-size: 16px;
+    font-weight: bold;
+    cursor: pointer;
+    transition: background-color 0.3s, color 0.3s, border-color 0.3s;
+}
+
+.gr-button-secondary:hover {
+    background-color: #003D7C;
+    color: white;
+    border-color: #003D7C;
+}
+
+.gr-button-secondary:active {
+    transform: translateY(1px);
+}
+
+.app-title {
+    color: #003D7C;
+    font-size: 24px;
+    font-weight: bold;
+    text-align: center;
+    margin-bottom: 20px;
+}
+"""
+
+with gr.Blocks(theme=custom_theme, css=custom_css) as iface:
     gr.Markdown("# Gradebook Data Processor", elem_classes=["app-title"])
     
     with gr.Tabs():
@@ -224,11 +261,12 @@ with gr.Blocks(theme=custom_theme, css="custom.css") as iface:
             process_btn = gr.Button("Process Data", variant="primary")
             output_msg = gr.Textbox(label="Processing Result")
             csv_location = gr.Textbox(label="Output Information")
+            gr.Markdown("## Step 2: Download Mail merge package")
             download_button = gr.File(visible=False, label="Download Results")
-            gr.Markdown("After processing, switch to the 'Data Insights' tab to view results and download files.")
+            gr.Markdown("Tip: 😎 After processing, switch to the 'Data Insights' tab at the top to view results and analytics.")
         
         with gr.TabItem("2. Data Insights Dashboard"):
-            gr.Markdown("## Step 2: Review insights and download results")
+            gr.Markdown("## Data Insights")
             summary_stats = gr.Markdown("Upload and process a file to see summary statistics.")
             
             with gr.Row():