Update app.py

app.py

@@ -173,21 +173,22 @@ def z_testes(n1, n2, p1, p2):
         return np.nan
 
 def z_test_data(df):
-
-    rows, cols = df.shape
-    styles = pd.DataFrame('background-color: lightgray;', index=df.index, columns=df.columns)
-
-    for i in range(rows-2):
-        for j in range(cols-2):
-            n1 = df.iloc[-1, -1]  # x_IJ
-            n2 = df.iloc[-1, j]  # x_Ij
-            p1 = df.iloc[i, -1]  # x_1J
-            p2 = df.iloc[i, j]  # x_ij
+    styles = pd.DataFrame('', index=df.index, columns=df.columns)
+    
+    num_rows, num_cols = df.shape
+    sample_size = df.iloc[-1, -1]  # Total sample size
+    
+    for i in range(num_rows -1):
+        for j in range(1, num_cols -1):
+            n1 = df.iloc[-1, -1]
+            n2 = df.iloc[-1, j]
+            p1 = df.iloc[i, -1]
+            p2 = df.iloc[i, j]
             p_value = z_testes(n1, n2, p1, p2)
-            if p_value <= 0.05:
-                styles.iloc[i, j] = 'background-color: lightgreen;'
-
-    return df.style.apply(lambda x: styles, axis=None)
+            if pd.notnull(p_value) and p_value <= 0.05:
+                styles.iloc[i, j] = 'background-color: lightgreen'
+    
+    return df.style.apply(lambda _: styles, axis=None)
 
 def Z_test_dataframes(sheets_data):
     """Processes each sheet's DataFrame and computes new DataFrames with Z-test results."""
@@ -339,7 +340,8 @@ if main_option == "Tabulation":
                         percentile_df, frequency_df = two_variable_ss(df[[var1, var2]], var1, var2)
                         st.subheader("Percentage Table")
                         #st.dataframe(z_test_data(percentile_df), unsafe_allow_html=True)
-                        st.dataframe(z_test_data(percentile_df), use_container_width=True)
+                        #st.dataframe(z_test_data(percentile_df), use_container_width=True)
+                        st.write(z_test_data(percentile_df))
 
                         st.subheader("Frequency Table")
                         st.dataframe(frequency_df)
@@ -353,7 +355,8 @@ if main_option == "Tabulation":
                             percentile_df, frequency_df = two_variable_sm(df[[var1] + matching_cols], var1, matching_cols)
                             st.subheader("Percentage Table")
                             #st.dataframe(z_test_data(percentile_df), unsafe_allow_html=True)
-                            st.dataframe(z_test_data(percentile_df), use_container_width=True)
+                            #st.dataframe(z_test_data(percentile_df), use_container_width=True)
+                            st.write(z_test_data(percentile_df))
 
                             st.subheader("Frequency Table")
                             st.dataframe(frequency_df)
@@ -371,7 +374,8 @@ if main_option == "Tabulation":
                             percentile_df, frequency_df = two_variable_mm(df[matching_cols1 + matching_cols2], matching_cols1, matching_cols2)
                             st.subheader("Percentage Table")
                             #st.dataframe(z_test_data(percentile_df), unsafe_allow_html=True)
-                            st.dataframe(z_test_data(percentile_df), use_container_width=True)
+                            #st.dataframe(z_test_data(percentile_df), use_container_width=True)
+                            st.write(z_test_data(percentile_df))
 
                             st.subheader("Frequency Table")
                             st.dataframe(frequency_df)