custom default.js & expertise format bisone

.gitignore

@@ -60,4 +60,3 @@ tests/playwright-report/
 # Dummy
 /dump
 platform/app/dist.zip
-platform/app/dist-sudirman.zip

extensions/default/src/ViewerLayout/index.tsx

@@ -146,7 +146,6 @@ function ViewerLayout({
               side="right"
               activeTabIndex={rightPanelClosedState ? null : 0}
               servicesManager={servicesManager}
-              expandedWidth={400}
             />
           ) : null}
         </React.Fragment>

platform/app/public/config/default.js

@@ -6,7 +6,7 @@ window.config = {
   extensions: [],
   modes: [],
   customizationService: {},
-  showStudyList: true,
+  showStudyList: false,
   // some windows systems have issues with more than 3 web workers
   maxNumberOfWebWorkers: 3,
   // below flag is for performance reasons, but it might not work for all servers
@@ -24,10 +24,22 @@ window.config = {
     prefetch: 25,
   },
   expertise: false, //* Tambahan untuk enable expertise (CustomizableViewportOverlay)
-  expertise_host: `http://192.168.2.13`, // IP ke NV di PACS Server, untuk fetch expertise bawaan versi NV
+  expertise_host: `https://devone.aplikasi.web.id/one-api/mockup/pacsmwl/Workorder/get_dummy_expertise`, //* Tambahan untuk fetch data Expertise)
-  pacs_document_host: `192.168.2.13`, // IP ke NV di PACS Server untuk ambil pdf
+  pacs_document_host: `152.42.173.210`,
   pacs_document_port: 8080,
+  // filterQueryParam: false,
+  // defaultDataSourceName: 'dicomweb',
   defaultDataSourceName: 'local-proxy',
+  /* Dynamic config allows user to pass "configUrl" query string this allows to load config without recompiling application. The regex will ensure valid configuration source */
+  // dangerouslyUseDynamicConfig: {
+  //   enabled: true,
+  //   // regex will ensure valid configuration source and default is /.*/ which matches any character. To use this, setup your own regex to choose a specific source of configuration only.
+  //   // Example 1, to allow numbers and letters in an absolute or sub-path only.
+  //   // regex: /(0-9A-Za-z.]+)(\/[0-9A-Za-z.]+)*/
+  //   // Example 2, to restricts to either hosptial.com or othersite.com.
+  //   // regex: /(https:\/\/hospital.com(\/[0-9A-Za-z.]+)*)|(https:\/\/othersite.com(\/[0-9A-Za-z.]+)*)/
+  //   regex: /.*/,
+  // },
   dataSources: [
     {
       namespace: '@ohif/extension-default.dataSourcesModule.dicomweb',
@@ -35,8 +47,9 @@ window.config = {
       configuration: {
         friendlyName: 'Static WADO Local Data',
         name: 'DCM4CHEE',
-        qidoRoot: `http://192.168.2.13:5000/rs`, // IP ke dicomweb-proxy PACS Server. URI selalu /rs
+        qidoRoot: `http://152.42.173.210:5000/rs`,
-        wadoRoot: `http://192.168.2.13:5000/rs`, // IP ke dicomweb-proxy PACS Server. URI selalu /rs      qidoSupportsIncludeField: false,
+        wadoRoot: `http://152.42.173.210:5000/rs`,
+        qidoSupportsIncludeField: false,
         supportsReject: true,
         supportsStow: true,
         imageRendering: 'wadors',

platform/ui-next/src/components/SidePanel/SidePanel.tsx

@@ -356,14 +356,21 @@ const SidePanel = ({
       }
 
       setIsExpertiseLoading(true);
-      const url = `${window.config.expertise_host}/nv/query.php?method=view&AccessionNumber=${encodeURIComponent(accessionNumber)}`;
+      const url = `${window.config.expertise_host}?accessionNo=${accessionNumber}`;
 
       const response = await fetch(url);
       const data = await response.json();
-      console.log('Study data:', data);
+      if (data?.status === 'OK' && data?.data) {
+        // Create expertise data in the format expected by your component
+        const formattedExpertiseData = {
+          ordering_physician: data.data.senderDoctorName,
+          radiologist: data.data.pjDoctorName,
+          expertise_dttm: data.data.expTime,
+          // Convert the expertise object to a string format that parseExpertise can handle
+          expertise: formatExpertiseToString(data.data.expertise),
+        };
 
-      if (data?.study?.expertise && data.study.expertise.length > 0) {
+        setExpertiseData(formattedExpertiseData);
-        setExpertiseData(data.study.expertise[0]);
       }
     } catch (error) {
       console.error('Error fetching expertise data:', error);
@@ -372,6 +379,32 @@ const SidePanel = ({
     }
   };
 
+  // Helper function to convert expertise object to string format
+  const formatExpertiseToString = expertiseObj => {
+    if (!expertiseObj) return '';
+
+    let result = '';
+
+    // Add each section with proper formatting
+    if (expertiseObj.Indikasi) {
+      result += `KLINIS: ${expertiseObj.Indikasi}\r\n`;
+    }
+
+    if (expertiseObj.Teknik) {
+      result += `TEKNIK: ${expertiseObj.Teknik}\r\n\r\n`;
+    }
+
+    if (expertiseObj.Deskripsi) {
+      result += `KETERANGAN:\r\n${expertiseObj.Deskripsi.replace(/\n/g, '\r\n')}\r\n\r\n`;
+    }
+
+    if (expertiseObj.Kesan) {
+      result += `KESAN: ${expertiseObj.Kesan}`;
+    }
+
+    return result;
+  };
+
   const getExpertisePanel = () => {
     if (side !== 'right') return null; // Only show in the right side panel
 
@@ -441,7 +474,7 @@ const SidePanel = ({
     });
 
     return (
-      <ScrollArea className="border-input bg-background h-[500px] w-full rounded-md border p-2 text-sm text-white">
+      <ScrollArea className="border-input bg-background h-[500px] w-[350px] rounded-md border p-2 text-sm text-white">
         <h3 className="mb-4 text-lg font-bold">Expertise</h3>
         {formattedData.map((section, index) => (
           <div
@@ -452,16 +485,11 @@ const SidePanel = ({
             {Array.isArray(section.value) ? (
               <ul className="list-disc pl-6">
                 {section.value.map((item, idx) => (
-                  <li
+                  <li key={idx}>{item}</li>
-                    key={idx}
-                    className="break-words"
-                  >
-                    {item}
-                  </li>
                 ))}
               </ul>
             ) : (
-              <p className="break-words">{section.value}</p>
+              <p>{section.value}</p>
             )}
           </div>
         ))}