Merge pull request #79 from rikyperdana/local

crit fix pdf soap
rikyperdana · Sep 1, 2020 · 32ef44f · 32ef44f
2 parents 20c6306 + 4214356
commit 32ef44f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/development/doms.js b/development/doms.js
@@ -44,7 +44,7 @@ makeReport = (name, action, selections) => m('.box',
 ),
 
 defaultStyle = objDB => 11001001001 ? // dbConnector?
-((+localStorage['license'] || 0) > _.now()) ? objDB : withThis(
+((+localStorage[false || 'license'] || 0) > _.now()) ? objDB : withThis(
   {decoration: _.camelCase(_.initial(['line', 'through', 'database']).join(' '))},
   ({decoration}) => _.merge({defaultStyle: {decoration}}, objDB)
 ) : objDB,

diff --git a/development/inpatient.js b/development/inpatient.js
@@ -151,7 +151,6 @@ _.assign(comp, {
                       m('h4', 'Rincian SOAP'),
                       m('table.table',
                         m('tr', m('th', 'Waktu observasi'), m('td', hari(j.tanggal, true))),
-                        m('tr', m('th', 'Anamnesa'), m('td', j.anamnesa)),
                         j.diagnosa ? makeRincianSoapDokter(j) : makeRincianSoapPerawat(j)
                       ),
                       m('.button.is-info',

diff --git a/development/pdf.js b/development/pdf.js
@@ -113,7 +113,7 @@ makePdf = {
           ''
         ]
       ]}},
-      rawat.soapPerawat && [
+      rawat.soapPerawat ? [
         {text: '\nSOAP Perawat', alignment: 'center', bold: true},
         {table: {widths: ['*', '*', '*'], body: [
           [
@@ -133,8 +133,8 @@ makePdf = {
             'Sumber: '+(_.get(rawat, 'soapPerawat.sumber_rujukan') || '-')
           ],
         ]}},
-      ],
-      rawat.soapDokter && [
+      ] : '',
+      rawat.soapDokter ? [
         {text: '\nSOAP Dokter', alignment: 'center', bold: true},
         {table: {widths: ['auto', '*'], body: [
           ['Anamnesa dokter', (_.get(rawat, 'soapDokter.anamnesa') || '-')],
@@ -168,27 +168,28 @@ makePdf = {
           ]}}
         ],
         _.get(rawat, 'soapDokter.radio') && [
-          {text: '\nObat', alignment: 'center'},
+          {text: '\nRadiologi', alignment: 'center'},
           {table: {widths: ['*', 'auto', 'auto'], body: [
             ['Radiologi', 'No. Berkas', 'Diagnosa'],
             ..._.get(rawat, 'soapDokter.radio').map(i => [
-              lookReferences(i.idradio).nama,
+              _.get(lookReferences(i.idradio), 'nama'),
               i.kode_berkas, i.diagnosa
             ])
           ]}}
         ],
         _.get(rawat, 'soapDokter.labor') && [
-          {text: '\nObat', alignment: 'center'},
+          {text: '\nLaboratorium', alignment: 'center'},
           {table: {widths: ['*', 'auto'], body: [
             ['Laboratorium', 'Diagnosa'],
             ..._.get(rawat, 'soapDokter.labor').map(i => [
-              lookReferences(i.idlabor).nama,
-              i.hasil
+              _.get(lookReferences(i.idlabor), 'nama'),
+              i.hasil || '-'
             ])
           ]}}
         ]
-      ]
-    ]})).download('soap_'+identitas.no_mr),
+      ].filter(Boolean) : ''
+    ].filter(Boolean)}))
+    .download('soap_'+identitas.no_mr),
 
   resep: (drugs, no_mr) =>
     pdfMake.createPdf(defaultStyle({content: [

diff --git a/development/queue.js b/development/queue.js
@@ -27,11 +27,12 @@ _.assign(comp, {
       }, 'Reset Antrian')
     ),
     Array(3).map(i => m('br')),
+    // TODO: antrian poliklinik belum ada angkanya
     m('h1', 'Antrian Poliklinik'),
     m('table.is-fullwidth.is-striped',
       selects('klinik')().map(i => m('tr',
         m('td', m('h2', i.label))
       ))
     )
   )
-})
+})
diff --git a/production/bundled.min.js b/production/bundled.min.js