소스 검색

Wizard table column updates

Vijayakrishnan 3 년 전
부모
커밋
bb635f7fbf

+ 3 - 0
public/css/style.css

@@ -1528,6 +1528,9 @@ table.table-edit-sheet .ql-container {
 table.table-edit-sheet .ql-editor[contenteditable] {
     min-height: 90px;
 }
+.w-30 {
+    width: 30%;
+}
 .w-35 {
     width: 35%;
 }

+ 18 - 23
resources/views/app/patient/allergies-center.blade.php

@@ -40,12 +40,10 @@ $numActiveItems = Point::getNumPointsOfCategory($patient, 'ALLERGY');
                 <th class="border-bottom-0 text-secondary text-center width-30px">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Name</th>
-                <th class="border-bottom-0 text-secondary">Edit</th>
-                <th class="border-bottom-0 text-secondary w-25">Subjective</th>
-                <th class="border-bottom-0 text-secondary w-25">Plan</th>
-                <th class="border-bottom-0 text-secondary">Active?</th>
-                <th class="border-bottom-0 text-secondary">Started</th>
-                <th class="border-bottom-0 text-secondary">Ended</th>
+                <th class="border-bottom-0 text-secondary width-50px">Edit</th>
+                <th class="border-bottom-0 text-secondary w-30">Subjective</th>
+                <th class="border-bottom-0 text-secondary w-30">Plan</th>
+                <th class="border-bottom-0 text-secondary width-30px"></th>
             </tr>
             </thead>
             <?php $prevRowState = -1; ?>
@@ -172,23 +170,20 @@ $numActiveItems = Point::getNumPointsOfCategory($patient, 'ALLERGY');
                     </div>
                 </td>
                 <td>
-                    @if($allergy->is_removed)
-                        NO
-                    @else
-                        <b>YES</b>
-                    @endif
-                </td>
-                <td>
-                    <?= !!@($allergy->data->start_date) ? friendly_date($allergy->data->start_date) : '-' ?>
-                    @if(!!@($allergy->data->prescriber))
-                        <div class="mt-1 text-sm text-secondary">By: <?= !!@($allergy->data->prescriber) ? @($allergy->data->prescriber) : '-' ?></div>
-                    @endif
-                </td>
-                <td>
-                    <?= !!@($allergy->removal_effective_date) ? friendly_date($allergy->removal_effective_date) : '-' ?>
-                    @if(!!@($allergy->removal_reason_memo))
-                        <div class="mt-1 text-sm text-secondary"><?= !!@($allergy->removal_reason_memo) ? @($allergy->removal_reason_memo) : '-' ?></div>
-                    @endif
+                    <div class="position-relative c-pointer stag-tooltip">
+                        <i class="fa fa-info-circle"></i>
+                        <div class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
+                            <div class="text-nowrap small text-left">Started <b><?= !!@($allergy->data->start_date) ? friendly_date($allergy->data->start_date) : '-' ?></b></div>
+                            @if(!!@($allergy->data->prescriber))
+                                <div class="text-sm text-left text-secondary">By: <?= !!@($allergy->data->prescriber) ? @($allergy->data->prescriber) : '-' ?></div>
+                            @endif
+                            <hr class="my-1">
+                            <div class="text-nowrap small text-left text-left">Ended <b><?= !!@($allergy->removal_effective_date) ? friendly_date($allergy->removal_effective_date) : '-' ?></b></div>
+                            @if(!!@($allergy->data->prescriber))
+                                <div class="text-sm text-secondary">By/Memo: <?= !!@($allergy->removal_reason_memo) ? @($allergy->removal_reason_memo) : '-' ?></div>
+                            @endif
+                        </div>
+                    </div>
                 </td>
             </tr>
             <?php endforeach; ?>

+ 18 - 23
resources/views/app/patient/careteam-center.blade.php

@@ -21,13 +21,11 @@ list($careTeamMembers, $counts) = Point::getPointsOfCategoryExtended($patient, '
                 <th class="border-bottom-0 text-secondary text-center width-30px">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Name/Details</th>
-                <th class="border-bottom-0 text-secondary">Edit</th>
-                <th class="border-bottom-0 text-secondary w-25">Subjective</th>
-                <th class="border-bottom-0 text-secondary w-25">Plan</th>
+                <th class="border-bottom-0 text-secondary width-50px">Edit</th>
+                <th class="border-bottom-0 text-secondary w-30">Subjective</th>
+                <th class="border-bottom-0 text-secondary w-30">Plan</th>
                 <th class="border-bottom-0 text-secondary">Contact</th>
-                <th class="border-bottom-0 text-secondary">Active?</th>
-                <th class="border-bottom-0 text-secondary">Started</th>
-                <th class="border-bottom-0 text-secondary">Ended</th>
+                <th class="border-bottom-0 text-secondary width-30px"></th>
             </tr>
             </thead>
             <?php $prevRowState = -1; ?>
@@ -210,23 +208,20 @@ list($careTeamMembers, $counts) = Point::getPointsOfCategoryExtended($patient, '
                     <?= '<span class="text-secondary">Fax: </span>' . (!!@($careTeamMember->data->fax) ? @($careTeamMember->data->fax) : '-') ?>
                 </td>
                 <td>
-                    @if($careTeamMember->is_removed)
-                        NO
-                    @else
-                        <b>YES</b>
-                    @endif
-                </td>
-                <td>
-                    <?= !!@($careTeamMember->data->start_date) ? friendly_date($careTeamMember->data->start_date) : '-' ?>
-                    @if(!!@($careTeamMember->data->prescriber))
-                        <div class="mt-1 text-sm text-secondary">By: <?= !!@($careTeamMember->data->prescriber) ? @($careTeamMember->data->prescriber) : '-' ?></div>
-                    @endif
-                </td>
-                <td>
-                    <?= !!@($careTeamMember->removal_effective_date) ? friendly_date($careTeamMember->removal_effective_date) : '-' ?>
-                    @if(!!@($careTeamMember->removal_reason_memo))
-                        <div class="mt-1 text-sm text-secondary">By: <?= !!@($careTeamMember->removal_reason_memo) ? @($careTeamMember->removal_reason_memo) : '-' ?></div>
-                    @endif
+                    <div class="position-relative c-pointer stag-tooltip">
+                        <i class="fa fa-info-circle"></i>
+                        <div class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
+                            <div class="text-nowrap small text-left">Started <b><?= !!@($careTeamMember->data->start_date) ? friendly_date($careTeamMember->data->start_date) : '-' ?></b></div>
+                            @if(!!@($careTeamMember->data->prescriber))
+                                <div class="text-sm text-left text-secondary">By: <?= !!@($careTeamMember->data->prescriber) ? @($careTeamMember->data->prescriber) : '-' ?></div>
+                            @endif
+                            <hr class="my-1">
+                            <div class="text-nowrap small text-left text-left">Ended <b><?= !!@($careTeamMember->removal_effective_date) ? friendly_date($careTeamMember->removal_effective_date) : '-' ?></b></div>
+                            @if(!!@($careTeamMember->data->prescriber))
+                                <div class="text-sm text-secondary">By/Memo: <?= !!@($careTeamMember->removal_reason_memo) ? @($careTeamMember->removal_reason_memo) : '-' ?></div>
+                            @endif
+                        </div>
+                    </div>
                 </td>
             </tr>
             <?php endforeach; ?>

+ 18 - 23
resources/views/app/patient/goals-center.blade.php

@@ -21,12 +21,10 @@ list($goals, $counts) = Point::getPointsOfCategoryExtended($patient, 'GOAL', $no
                 <th class="border-bottom-0 text-secondary text-center width-30px">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Goal</th>
-                <th class="border-bottom-0 text-secondary">Edit</th>
-                <th class="border-bottom-0 text-secondary w-25">Subjective</th>
-                <th class="border-bottom-0 text-secondary w-25">Plan</th>
-                <th class="border-bottom-0 text-secondary">Active?</th>
-                <th class="border-bottom-0 text-secondary">Started</th>
-                <th class="border-bottom-0 text-secondary">Ended</th>
+                <th class="border-bottom-0 text-secondary width-50px">Edit</th>
+                <th class="border-bottom-0 text-secondary w-30">Subjective</th>
+                <th class="border-bottom-0 text-secondary w-30">Plan</th>
+                <th class="border-bottom-0 text-secondary width-30px"></th>
             </tr>
             </thead>
             <?php $prevRowState = -1; ?>
@@ -149,23 +147,20 @@ list($goals, $counts) = Point::getPointsOfCategoryExtended($patient, 'GOAL', $no
                     </div>
                 </td>
                 <td>
-                    @if($goal->is_removed)
-                        NO
-                    @else
-                        <b>YES</b>
-                    @endif
-                </td>
-                <td>
-                    <?= !!@($goal->data->start_date) ? friendly_date($goal->data->start_date) : '-' ?>
-                    @if(!!@($goal->data->prescriber))
-                        <div class="mt-1 text-sm text-secondary">By: <?= !!@($goal->data->prescriber) ? @($goal->data->prescriber) : '-' ?></div>
-                    @endif
-                </td>
-                <td>
-                    <?= !!@($goal->removal_effective_date) ? friendly_date($goal->removal_effective_date) : '-' ?>
-                    @if(!!@($goal->removal_reason_memo))
-                        <div class="mt-1 text-sm text-secondary">By: <?= !!@($goal->removal_reason_memo) ? @($goal->removal_reason_memo) : '-' ?></div>
-                    @endif
+                    <div class="position-relative c-pointer stag-tooltip">
+                        <i class="fa fa-info-circle"></i>
+                        <div class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
+                            <div class="text-nowrap small text-left">Started <b><?= !!@($goal->data->start_date) ? friendly_date($goal->data->start_date) : '-' ?></b></div>
+                            @if(!!@($goal->data->prescriber))
+                                <div class="text-sm text-left text-secondary">By: <?= !!@($goal->data->prescriber) ? @($goal->data->prescriber) : '-' ?></div>
+                            @endif
+                            <hr class="my-1">
+                            <div class="text-nowrap small text-left text-left">Ended <b><?= !!@($goal->removal_effective_date) ? friendly_date($goal->removal_effective_date) : '-' ?></b></div>
+                            @if(!!@($goal->data->prescriber))
+                                <div class="text-sm text-secondary">By/Memo: <?= !!@($goal->removal_reason_memo) ? @($goal->removal_reason_memo) : '-' ?></div>
+                            @endif
+                        </div>
+                    </div>
                 </td>
             </tr>
             <?php endforeach; ?>

+ 18 - 23
resources/views/app/patient/medications-center.blade.php

@@ -35,12 +35,10 @@ $numActiveItems = Point::getNumPointsOfCategory($patient, 'MEDICATION');
                 <th class="border-bottom-0 text-secondary text-center width-30px">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Name</th>
-                <th class="border-bottom-0 text-secondary">Edit</th>
-                <th class="border-bottom-0 text-secondary w-25">Subjective</th>
-                <th class="border-bottom-0 text-secondary w-25">Plan</th>
-                <th class="border-bottom-0 text-secondary">Active?</th>
-                <th class="border-bottom-0 text-secondary">Started</th>
-                <th class="border-bottom-0 text-secondary">Ended</th>
+                <th class="border-bottom-0 text-secondary width-50px">Edit</th>
+                <th class="border-bottom-0 text-secondary w-30">Subjective</th>
+                <th class="border-bottom-0 text-secondary w-30">Plan</th>
+                <th class="border-bottom-0 text-secondary width-30px"></th>
             </tr>
             </thead>
             <?php $prevRowState = -1; ?>
@@ -170,23 +168,20 @@ $numActiveItems = Point::getNumPointsOfCategory($patient, 'MEDICATION');
                         </div>
                     </td>
                     <td>
-                        @if($medication->is_removed)
-                            NO
-                        @else
-                            <b>YES</b>
-                        @endif
-                    </td>
-                    <td>
-                        <?= !!@($medication->data->start_date) ? friendly_date($medication->data->start_date) : '-' ?>
-                        @if(!!@($medication->data->prescriber))
-                            <div class="mt-1 text-sm text-secondary">By: <?= !!@($medication->data->prescriber) ? @($medication->data->prescriber) : '-' ?></div>
-                        @endif
-                    </td>
-                    <td>
-                        <?= !!@($medication->removal_effective_date) ? friendly_date($medication->removal_effective_date) : '-' ?>
-                        @if(!!@($medication->removal_reason_memo))
-                            <div class="mt-1 text-sm text-secondary">By: <?= !!@($medication->removal_reason_memo) ? @($medication->removal_reason_memo) : '-' ?></div>
-                        @endif
+                        <div class="position-relative c-pointer stag-tooltip">
+                            <i class="fa fa-info-circle"></i>
+                            <div class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
+                                <div class="text-nowrap small text-left">Started <b><?= !!@($medication->data->start_date) ? friendly_date($medication->data->start_date) : '-' ?></b></div>
+                                @if(!!@($medication->data->prescriber))
+                                    <div class="text-sm text-left text-secondary">By: <?= !!@($medication->data->prescriber) ? @($medication->data->prescriber) : '-' ?></div>
+                                @endif
+                                <hr class="my-1">
+                                <div class="text-nowrap small text-left text-left">Ended <b><?= !!@($medication->removal_effective_date) ? friendly_date($medication->removal_effective_date) : '-' ?></b></div>
+                                @if(!!@($medication->data->prescriber))
+                                    <div class="text-sm text-secondary">By/Memo: <?= !!@($medication->removal_reason_memo) ? @($medication->removal_reason_memo) : '-' ?></div>
+                                @endif
+                            </div>
+                        </div>
                     </td>
                 </tr>
             <?php endforeach; ?>

+ 18 - 23
resources/views/app/patient/problems-center.blade.php

@@ -35,12 +35,10 @@ $ccSegment = $ccSegment ?? $note->getSegmentByInternalName('mc_cc');
                 <th class="border-bottom-0 text-secondary text-center width-30px">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Name</th>
-                <th class="border-bottom-0 text-secondary">Edit</th>
-                <th class="border-bottom-0 text-secondary w-25">Subjective/HPI</th>
-                <th class="border-bottom-0 text-secondary w-25">Plan</th>
-                <th class="border-bottom-0 text-secondary">Active?</th>
-                <th class="border-bottom-0 text-secondary">Started</th>
-                <th class="border-bottom-0 text-secondary">Ended</th>
+                <th class="border-bottom-0 text-secondary width-50px">Edit</th>
+                <th class="border-bottom-0 text-secondary w-30">Subjective/HPI</th>
+                <th class="border-bottom-0 text-secondary w-30">Plan</th>
+                <th class="border-bottom-0 text-secondary width-30px"></th>
             </tr>
             </thead>
             <?php $prevRowState = -1; ?>
@@ -187,23 +185,20 @@ $ccSegment = $ccSegment ?? $note->getSegmentByInternalName('mc_cc');
                     </div>
                 </td>
                 <td>
-                    @if($problem->is_removed)
-                        NO
-                    @else
-                        <b>YES</b>
-                    @endif
-                </td>
-                <td>
-                    <?= !!@($problem->data->start_date) ? friendly_date($problem->data->start_date) : '-' ?>
-                    @if(!!@($problem->data->prescriber))
-                        <div class="mt-1 text-sm text-secondary">By: <?= !!@($problem->data->prescriber) ? @($problem->data->prescriber) : '-' ?></div>
-                    @endif
-                </td>
-                <td>
-                    <?= !!@($problem->removal_effective_date) ? friendly_date($problem->removal_effective_date) : '-' ?>
-                    @if(!!@($problem->removal_reason_memo))
-                        <div class="mt-1 text-sm text-secondary"><?= !!@($problem->removal_reason_memo) ? @($problem->removal_reason_memo) : '-' ?></div>
-                    @endif
+                    <div class="position-relative c-pointer stag-tooltip">
+                        <i class="fa fa-info-circle"></i>
+                        <div class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
+                            <div class="text-nowrap small text-left">Started <b><?= !!@($problem->data->start_date) ? friendly_date($problem->data->start_date) : '-' ?></b></div>
+                            @if(!!@($problem->data->prescriber))
+                                <div class="text-sm text-left text-secondary">By: <?= !!@($problem->data->prescriber) ? @($problem->data->prescriber) : '-' ?></div>
+                            @endif
+                            <hr class="my-1">
+                            <div class="text-nowrap small text-left text-left">Ended <b><?= !!@($problem->removal_effective_date) ? friendly_date($problem->removal_effective_date) : '-' ?></b></div>
+                            @if(!!@($problem->data->prescriber))
+                                <div class="text-sm text-secondary">By/Memo: <?= !!@($problem->removal_reason_memo) ? @($problem->removal_reason_memo) : '-' ?></div>
+                            @endif
+                        </div>
+                    </div>
                 </td>
             </tr>
             <?php endforeach; ?>

+ 18 - 23
resources/views/app/patient/supplements-center.blade.php

@@ -22,12 +22,10 @@ list($supplements, $counts) = Point::getPointsOfCategoryExtended($patient, 'SUPP
                 <th class="border-bottom-0 text-secondary text-center width-30px">Rel.</th>
                 @endif
                 <th class="border-bottom-0 text-secondary">Name</th>
-                <th class="border-bottom-0 text-secondary">Edit</th>
-                <th class="border-bottom-0 text-secondary w-25">Subjective</th>
-                <th class="border-bottom-0 text-secondary w-25">Plan</th>
-                <th class="border-bottom-0 text-secondary">Active?</th>
-                <th class="border-bottom-0 text-secondary">Started</th>
-                <th class="border-bottom-0 text-secondary">Ended</th>
+                <th class="border-bottom-0 text-secondary width-50px">Edit</th>
+                <th class="border-bottom-0 text-secondary w-30">Subjective</th>
+                <th class="border-bottom-0 text-secondary w-30">Plan</th>
+                <th class="border-bottom-0 text-secondary width-30px"></th>
             </tr>
             </thead>
             <?php $prevRowState = -1; ?>
@@ -151,23 +149,20 @@ list($supplements, $counts) = Point::getPointsOfCategoryExtended($patient, 'SUPP
                         </div>
                     </td>
                     <td>
-                        @if($supplement->is_removed)
-                            NO
-                        @else
-                            <b>YES</b>
-                        @endif
-                    </td>
-                    <td>
-                        <?= !!@($supplement->data->start_date) ? friendly_date($supplement->data->start_date) : '-' ?>
-                        @if(!!@($supplement->data->prescriber))
-                            <div class="mt-1 text-sm text-secondary">By: <?= !!@($supplement->data->prescriber) ? @($supplement->data->prescriber) : '-' ?></div>
-                        @endif
-                    </td>
-                    <td>
-                        <?= !!@($supplement->removal_effective_date) ? friendly_date($supplement->removal_effective_date) : '-' ?>
-                        @if(!!@($supplement->removal_reason_memo))
-                            <div class="mt-1 text-sm text-secondary">By: <?= !!@($supplement->removal_reason_memo) ? @($supplement->removal_reason_memo) : '-' ?></div>
-                        @endif
+                        <div class="position-relative c-pointer stag-tooltip">
+                            <i class="fa fa-info-circle"></i>
+                            <div class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
+                                <div class="text-nowrap small text-left">Started <b><?= !!@($supplement->data->start_date) ? friendly_date($supplement->data->start_date) : '-' ?></b></div>
+                                @if(!!@($supplement->data->prescriber))
+                                    <div class="text-sm text-left text-secondary">By: <?= !!@($supplement->data->prescriber) ? @($supplement->data->prescriber) : '-' ?></div>
+                                @endif
+                                <hr class="my-1">
+                                <div class="text-nowrap small text-left text-left">Ended <b><?= !!@($supplement->removal_effective_date) ? friendly_date($supplement->removal_effective_date) : '-' ?></b></div>
+                                @if(!!@($supplement->data->prescriber))
+                                    <div class="text-sm text-secondary">By/Memo: <?= !!@($supplement->removal_reason_memo) ? @($supplement->removal_reason_memo) : '-' ?></div>
+                                @endif
+                            </div>
+                        </div>
                     </td>
                 </tr>
             <?php endforeach; ?>