Merge branch 'main' of github.com:ModusCreateOrg/app-med-ai-gen into ADE-200

Author: GuidoBR

frontend/src/common/utils/i18n/resources/en/reportDetail.json

@@ -67,7 +67,7 @@
     },
     "normal-values": {
       "title": "Normal values",
-      "empty": "No values available.",
+      "empty": "No values to display",
       "empty-description": "No normal values within the normal range were detected."
     },
     "conclusion": {

frontend/src/pages/Processing/ProcessingPage.scss

@@ -6,7 +6,7 @@
     border-radius: 32px;
     height: 100%;
     margin: 0;
-    padding: 24px;
+    padding: 20px;
     display: flex;
     flex-direction: column;
     position: relative;
@@ -24,6 +24,7 @@
     // Styles for the Avatar component
     .ls-avatar {
       --size: 60px !important;
+
       margin: 0;
 
       // This makes sure even round avatars are sized correctly
@@ -42,7 +43,7 @@
   &__subtitle {
     font-size: 20px;
     color: #9ba1ab;
-    margin: 0 0 5px 0;
+    margin: 0 0 5px;
     font-weight: 400;
   }
 
@@ -64,6 +65,7 @@
     width: 230px;
     height: 230px;
     animation: pulse 2s infinite ease-in-out;
+    margin: auto;
   }
 
   // Error component styling - final adjustments
@@ -86,24 +88,24 @@
   }
 
   &__error-header {
-    margin-bottom: 40px;
+    margin-bottom: 120px;
     text-align: left;
     align-self: flex-start;
     width: 100%;
   }
 
   &__error-oops {
-    font-size: 24px;
+    font-size: 18px;
     font-weight: 400;
     color: #8e8e93;
     margin: 0 0 4px;
   }
 
   &__error-title {
-    font-size: 34px;
-    font-weight: 700;
+    font-size: 26px;
+    font-weight: 600;
     margin: 0;
-    color: #1c1c1e;
+    color: #313e4c;
     line-height: 1.2;
   }
 
@@ -146,19 +148,20 @@
     flex-direction: row;
     gap: 12px;
     width: 100%;
-    padding: 0 8px; // Reduced side padding to make buttons wider
-    max-width: 450px; // Increased max-width from 400px
+    padding: 0 5px;
     margin-left: auto;
     margin-right: auto;
-    margin-bottom: 8px; // Further reduced from 20px to 8px
+    margin-bottom: 8px;
 
     ion-button {
       margin: 0;
-      height: 48px;
+      height: 54px;
+
       --border-radius: 8px;
       --border-width: 1px;
       --padding-top: 0;
       --padding-bottom: 0;
+
       font-size: 16px;
       font-weight: 600;
       text-transform: none;
@@ -171,10 +174,10 @@
     --color: #4361ee;
     --border-color: #4361ee;
     --background: transparent;
-    --background-hover: rgba(67, 97, 238, 0.1);
-    --background-activated: rgba(67, 97, 238, 0.2);
+    --background-hover: rgb(67 97 238 / 10%);
+    --background-activated: rgb(67 97 238 / 20%);
     --box-shadow: none;
-    --ripple-color: rgba(67, 97, 238, 0.1);
+    --ripple-color: rgb(67 97 238 / 10%);
   }
 
   &__upload-btn {
@@ -192,10 +195,12 @@
     transform: scale(0.95);
     opacity: 0.8;
   }
+
   50% {
     transform: scale(1);
     opacity: 1;
   }
+
   100% {
     transform: scale(0.95);
     opacity: 0.8;

frontend/src/pages/Reports/ReportDetailPage.scss

@@ -193,7 +193,6 @@
 
   &__section-empty {
     padding: 24px 16px 32px;
-    background-color: #fff;
   }
 
   &__section-empty-content {
@@ -554,10 +553,11 @@
   &__results-cell--test {
     flex: 2;
     font-size: 12px;
-    min-width: 160px;
+    min-width: 40px;
     overflow-wrap: break-word;
     white-space: normal; // Allow text to wrap
     word-break: break-word; // Ensure long words break
+    line-height: 1.4em;
   }
 
   &__results-cell--value {
@@ -579,11 +579,14 @@
     white-space: normal; // Allow text to wrap
     word-break: break-word; // Ensure long words break
     overflow-wrap: break-word;
+    line-height: 1.4em;
+    margin-left: 6px;
+    margin-top: 4px;
+    margin-bottom: 4px;
   }
 
   &__results-cell-header--test {
     flex: 2;
-    min-width: 160px;
     overflow-wrap: break-word;
     white-space: normal; // Allow text to wrap
     word-break: break-word; // Ensure long words break

frontend/src/pages/Reports/ReportDetailPage.tsx

@@ -15,6 +15,7 @@ import OriginalReportTab from './components/OriginalReportTab';
 import InfoCard from './components/InfoCard';
 import ActionButtons from './components/ActionButtons';
 import AiAnalysisTab from './components/AiAnalysisTab';
+import UploadModal from 'common/components/Upload/UploadModal';
 
 const API_URL = import.meta.env.VITE_BASE_URL_API || '';
 
@@ -36,6 +37,12 @@ const ReportDetailPage: React.FC = () => {
   const history = useHistory();
   const { t } = useTranslation();
   const { createToast } = useToasts();
+  const [isUploadModalOpen, setIsUploadModalOpen] = useState(false);
+
+  const handleUploadComplete = () => {
+    setIsUploadModalOpen(false);
+    history.push('/tabs/home');
+  };
 
   // Fetch report data using react-query
   const { data, isLoading, error } = useQuery<MedicalReport>({
@@ -122,8 +129,7 @@ const ReportDetailPage: React.FC = () => {
       setIsProcessing(true);
       await axios.delete(`${API_URL}/api/reports/${reportId}`, await getAuthConfig());
       setIsProcessing(false);
-
-      history.push('/tabs/upload');
+      setIsUploadModalOpen(true);
     } catch (error) {
       setIsProcessing(false);
       console.error('Error deleting report before new upload:', error);
@@ -159,6 +165,12 @@ const ReportDetailPage: React.FC = () => {
           onNewUpload={handleNewUpload}
           reportTitle={reportData.title}
         />
+
+        <UploadModal
+          isOpen={isUploadModalOpen}
+          onClose={() => setIsUploadModalOpen(false)}
+          onUploadComplete={handleUploadComplete}
+        />
       </IonContent>
     </IonPage>
   );

frontend/src/pages/Reports/components/OriginalReportTab.tsx

@@ -77,7 +77,7 @@ const OriginalReportTab: React.FC<OriginalReportTabProps> = ({ reportData }) =>
       </div>
 
       {/* Medical Comments Section */}
-      {reportData.medicalComments.length > 0 && (
+      {reportData.medicalComments?.length > 0 && (
         <div className="report-detail-page__comments-section">
           <h4 className="report-detail-page__comments-title">Medical Comments:</h4>
           <div className="report-detail-page__comments-text">{reportData.medicalComments}</div>

frontend/src/pages/Reports/components/ReportHeader.tsx

@@ -22,6 +22,8 @@ const ReportHeader: React.FC<ReportHeaderProps> = ({ reportData, onClose }) => {
         </button>
       </div>
 
+      <hr style={{ backgroundColor: '#D7DBEC', height: '1px', width: '100%', marginTop: '25px' }} />
+
       {/* Category & Title */}
       <div className="report-detail-page__category-wrapper">
         <span className="report-detail-page__category">