limit ? "visible" : "invisible",
!noMargin && "mt-4",
diff --git a/src/index.tsx b/src/index.tsx
index 9154b832187..4f8ac291d51 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,5 +1,6 @@
import careConfig from "@careConfig";
import * as Sentry from "@sentry/browser";
+import React from "react";
import { createRoot } from "react-dom/client";
import { registerSW } from "virtual:pwa-register";
@@ -31,4 +32,8 @@ if (import.meta.env.PROD) {
}
const root = createRoot(document.getElementById("root") as HTMLElement);
-root.render(
);
+root.render(
+
+
+ ,
+);
diff --git a/src/pages/Appointments/AppointmentsPage.tsx b/src/pages/Appointments/AppointmentsPage.tsx
index 2a9fd13d298..dfb7c5e1401 100644
--- a/src/pages/Appointments/AppointmentsPage.tsx
+++ b/src/pages/Appointments/AppointmentsPage.tsx
@@ -399,53 +399,52 @@ export default function AppointmentsPage(props: { facilityId?: string }) {
: t("no_results")}
-
+
+ setQParams({
+ ...qParams,
+ practitioner: null,
+ slot: null,
+ })
+ }
+ className="cursor-pointer w-full"
+ >
+
+ {t("show_all")}
+ {!qParams.practitioner && (
+
+ )}
+
+
+ {schedulableUsersQuery.data?.users.map((user) => (
setQParams({
...qParams,
- practitioner: null,
+ practitioner: user.username,
slot: null,
})
}
- className="cursor-pointer"
+ className="cursor-pointer w-full"
>
- {t("show_all")}
- {!qParams.practitioner && (
+
+
+ {formatName(user)}
+
+ {user.user_type}
+
+
+ {qParams.practitioner === user.username && (
)}
-
- {schedulableUsersQuery.data?.users.map((user) => (
-
-
- setQParams({
- ...qParams,
- practitioner: user.username,
- slot: null,
- })
- }
- className="cursor-pointer"
- >
-
-
-
{formatName(user)}
-
- {user.user_type}
-
-
diff --git a/src/pages/Facility/settings/organizations/components/FacilityOrganizationLayout.tsx b/src/pages/Facility/settings/organizations/components/FacilityOrganizationLayout.tsx
index fd34b3449e2..de12da5794e 100644
--- a/src/pages/Facility/settings/organizations/components/FacilityOrganizationLayout.tsx
+++ b/src/pages/Facility/settings/organizations/components/FacilityOrganizationLayout.tsx
@@ -105,7 +105,9 @@ export default function FacilityOrganizationLayout({
asChild
className="text-sm text-gray-900 hover:underline hover:underline-offset-2"
>
-
{parent.name}
+
+ {parent.name}
+
diff --git a/src/pluginTypes.ts b/src/pluginTypes.ts
index f25c3aa7eb3..180df1502a2 100644
--- a/src/pluginTypes.ts
+++ b/src/pluginTypes.ts
@@ -31,6 +31,10 @@ export type PatientInfoCardActionsComponentType = React.FC<{
className?: string;
}>;
+export type PatientInfoCardMarkAsCompleteComponentType = React.FC<{
+ encounter: Encounter;
+}>;
+
export type FacilityHomeActionsComponentType = React.FC<{
facility: FacilityData;
className?: string;
@@ -53,6 +57,7 @@ export type SupportedPluginComponents = {
Scribe: ScribeComponentType;
PatientHomeActions: PatientHomeActionsComponentType;
PatientInfoCardActions: PatientInfoCardActionsComponentType;
+ PatientInfoCardMarkAsComplete: PatientInfoCardMarkAsCompleteComponentType;
FacilityHomeActions: FacilityHomeActionsComponentType;
PatientRegistrationForm: PatientRegistrationFormComponentType;
PatientDetailsTabDemographyGeneralInfo: PatientDetailsTabDemographyGeneralInfoComponentType;
diff --git a/src/service-worker.ts b/src/service-worker.ts
index 078e4237c28..973ff051736 100644
--- a/src/service-worker.ts
+++ b/src/service-worker.ts
@@ -1,6 +1,4 @@
///
-
-/* eslint-disable no-restricted-globals */
// This service worker can be customized!
// See https://developers.google.com/web/tools/workbox/modules
// for the list of available Workbox modules, or add any other
@@ -13,7 +11,6 @@ import { precacheAndRoute } from "workbox-precaching";
declare const self: ServiceWorkerGlobalScope;
-// eslint-disable-next-line no-restricted-globals
const _ignored = self.__WB_MANIFEST.map((_) => {
return _;
});
diff --git a/src/style/CAREUI.css b/src/style/CAREUI.css
index 893d16c2e4e..0e01efa2853 100644
--- a/src/style/CAREUI.css
+++ b/src/style/CAREUI.css
@@ -1,34 +1,3 @@
-.cui-input-legend::before {
- content: " ";
- position: absolute;
- left: -4px;
- right: -4px;
- top: calc(50% - 3px);
- height: 6px;
- background: #fff;
- z-index: -1;
-}
-
-.cui-label-required::after {
- content: "*";
- color: rgb(255, 81, 0);
- font-size: 1.2em;
- font-weight: bold;
- margin-left: 4px;
-}
-
-.cui-input-base {
- @apply text-sm block w-full py-3 px-4 text-black placeholder:text-secondary-600 bg-white disabled:bg-secondary-200 border border-secondary-400 focus:border-primary-400 ring-0 focus:ring-1 ring-primary-400 outline-none focus:outline-none shadow-none rounded transition-colors duration-300 !important
-}
-
-.cui-dropdown-base {
- @apply z-40 w-full rounded-b-md xl:rounded-b-lg shadow-lg overflow-auto max-h-96 bg-secondary-100 divide-y divide-secondary-300 ring-1 ring-secondary-400 focus:outline-none
-}
-
-.cui-card {
- @apply bg-white p-5 rounded-lg shadow
-}
-
.tooltip {
@apply relative
}
@@ -83,41 +52,6 @@
transform: translateY(0px);
}
-.cui-input:-webkit-autofill,
-.cui-input:-webkit-autofill:hover,
-.cui-input:-webkit-autofill:focus,
-.cui-input:-webkit-autofill:active {
- box-shadow: 0 0 0 40px #f9fafb inset !important;
- -webkit-box-shadow: 0 0 0 40px #f9fafb inset !important;
-}
-
-.cui-slideover-x {
- @apply w-full md:w-[300px] h-full
-}
-
-.cui-slideover-y {
- @apply h-full md:h-[300px] w-full
-}
-
-.dropdown-item-primary { @apply accent-primary-500 hover:bg-primary-100 text-black hover:text-primary-500 }
-.dropdown-item-secondary { @apply accent-secondary-200 hover:bg-secondary-200 text-secondary-700 }
-.dropdown-item-danger { @apply accent-danger-500 hover:bg-danger-100 text-danger-500 }
-.dropdown-item-warning { @apply accent-warning-500 hover:bg-warning-100 text-warning-500 }
-.dropdown-item-alert { @apply accent-alert-600 hover:bg-alert-100 text-alert-600 }
-
-.cui-form-button-group {
- @apply flex flex-col-reverse md:flex-row md:justify-end gap-2 w-full md:w-auto
-}
-
-.cui-range-slider {
- @apply outline-none bg-black/10 h-2 w-full appearance-none transition-all
-}
-.cui-range-slider::-webkit-slider-thumb {
- @apply appearance-none w-5 aspect-square bg-black border border-black rounded-full cursor-pointer hover:scale-125 transition-all
-}
-.cui-range-slider::-moz-range-thumb {
- @apply appearance-none w-5 aspect-square bg-black border border-black rounded-full cursor-pointer
-}
hr {
@apply border border-secondary-300
}
diff --git a/src/style/index.css b/src/style/index.css
index 2f14f673a18..4c7410e732b 100644
--- a/src/style/index.css
+++ b/src/style/index.css
@@ -10,23 +10,7 @@
@tailwind base;
@tailwind components;
-
-@keyframes indeterminateAnimation {
- 0% {
- transform: translateX(0) scaleX(0);
- }
- 40% {
- transform: translateX(0) scaleX(0.4);
- }
- 100% {
- transform: translateX(100%) scaleX(0.5);
- }
-}
-
-.indeterminate {
- animation: indeterminateAnimation 1s infinite linear;
- transform-origin: 0% 50%;
-}
+@tailwind utilities;
html {
@@ -72,363 +56,12 @@ h6 {
font-size: 0.875rem;
}
-.btn {
- @apply inline-flex items-center justify-center whitespace-nowrap text-sm font-semibold py-2 px-4 rounded cursor-pointer;
-}
-
-.btn:focus {
- @apply outline-none shadow-inner;
-}
-
-[type="text"]:focus {
- @apply border-black ring-white;
-}
-
-
-/* Button Styles */
-
-.btn-large {
- @apply py-2 px-5 text-base h-10;
-}
-
-a {
- @apply text-blue-800;
-}
-
-a:hover {
- @apply text-blue-600;
-}
-
-.bg-primary {
- background-image: linear-gradient( 135deg, rgba(56, 161, 105, 1) 0%, rgba(47, 133, 90, 1) 100%);
-}
-
-
-/* Button */
-
-button:focus {
- outline: none;
-}
-
-.btn {
- @apply inline-flex items-center justify-center whitespace-nowrap text-sm font-semibold py-2 px-4 rounded cursor-pointer;
-}
-
-.btn:focus {
- @apply outline-none shadow-inner;
-}
-
-
-/* Button Styles */
-
-.btn-default {
- @apply border text-secondary-800;
-}
-
-.btn-default:hover {
- @apply bg-secondary-100 text-secondary-600;
-}
-
-.btn-default:focus {
- @apply bg-secondary-400 text-secondary-700;
-}
-
-.btn-subtle {
- @apply bg-secondary-200 text-secondary-800;
-}
-
-.btn-subtle:hover {
- @apply bg-secondary-300 text-secondary-900;
-}
-
-.btn-subtle:focus {
- @apply bg-secondary-400 text-secondary-900;
-}
-
-.btn-primary-ghost {
- @apply bg-white text-primary-500 border border-primary-500;
-}
-
-.btn-primary-ghost:hover {
- @apply bg-primary-100 text-primary-600 border-primary-400;
-}
-
-.btn-primary-ghost:focus {
- @apply bg-primary-800 text-white border-primary-400;
-}
-
-.btn-primary {
- @apply bg-primary-500 text-white;
-}
-
-.btn-primary:hover {
- @apply bg-primary-600;
-}
-
-.btn-primary:focus {
- @apply bg-primary-800;
- background-image: none;
-}
-
-.btn-warning {
- @apply bg-yellow-500 text-white;
- background-image: linear-gradient( 135deg, rgba(237, 137, 54, 1) 0%, rgba(221, 107, 32, 1) 100%);
-}
-
-.btn-warning:hover {
- @apply bg-yellow-600;
- background-image: linear-gradient( 135deg, rgba(221, 107, 32, 1) 0%, rgba(192, 86, 33, 1) 100%);
-}
-
-.btn-warning:focus {
- @apply bg-yellow-800;
- background-image: none;
-}
-
-.btn-danger {
- @apply bg-red-500 text-white;
- background-image: linear-gradient( 135deg, rgba(245, 101, 101, 1) 0%, rgba(229, 62, 62, 1) 100%);
-}
-
-.btn-danger:hover {
- @apply bg-red-600;
- background-image: linear-gradient( 135deg, rgba(229, 62, 62, 1) 0%, rgba(197, 48, 48, 1) 100%);
-}
-
-.btn-danger:focus {
- @apply bg-red-800;
- background-image: none;
-}
-
-
-.primary-button {
- @apply focus:outline-none text-white bg-primary-500 hover:bg-primary-800 focus:ring-4 focus:ring-green-300 font-medium rounded-lg text-sm px-6 py-2.5 mr-2 mb-2 transition-all ease-in-out duration-200 !important;
-}
-
-.secondary-button {
- @apply text-secondary-900 bg-white border border-secondary-300 focus:outline-none hover:bg-secondary-100 focus:ring-4 focus:ring-secondary-200 font-medium rounded-lg text-sm px-6 py-2.5 mr-2 mb-2 transition-all ease-in-out duration-200 !important;
-}
-
-button:disabled,
-.disabled {
- @apply cursor-not-allowed bg-secondary-300 text-secondary-500 shadow-none border-transparent;
- background-image: none;
-}
-
-button:disabled:hover,
-.disabled:hover,
-button:disabled:focus,
-.disabled:focus {
- @apply bg-secondary-300 text-secondary-500 border-transparent shadow-none;
- background-image: none;
-}
-
-.btn-small {
- @apply py-1 px-3 text-xs h-7 leading-normal;
-}
-
-.btn-normal {
- @apply py-1 px-4 text-sm h-8;
-}
-
-.btn-large {
- @apply py-2 px-5 text-base h-10;
-}
-
-.button-xl {
- @apply py-2 px-6 text-base h-12;
-}
-
-@tailwind utilities;
-.multiselect-dropdown__search-dropdown {
- max-height: 20rem;
- overflow: auto;
-}
-
-.max-height-dropdown {
- max-height: 20rem;
- overflow: auto;
-}
-
-
-/* Radio */
-
-.radio-label {
- @apply select-none cursor-pointer;
-}
-
-.radio-label span {
- @apply inline-block align-middle;
- transform: translate3d(0, 0, 0);
-}
-
-.radio-label span:first-child {
- @apply relative rounded-full align-middle border border-secondary-500 bg-white mr-3;
- width: 1.125rem;
- height: 1.125rem;
- transform: scale(1);
- transition: all 0.2s ease;
-}
-
-.radio-label span:first-child svg {
- position: absolute;
- top: 0;
- left: 0;
- fill: none;
- stroke: #ffffff;
- stroke-width: 2;
- stroke-linecap: round;
- stroke-linejoin: round;
- transition: all 0.3s ease;
- transition-delay: 0.1s;
-}
-
-.radio-label span:first-child:before {
- content: "";
- @apply bg-primary-500 w-full h-full block opacity-100 rounded-full;
- transform: scale(0);
-}
-
-.radio-label:hover span:first-child {
- @apply bg-primary-100 border-primary-500;
-}
-
-.radio-input:checked+.radio-label span:first-child {
- @apply bg-primary-500 border-primary-500;
- animation: wave 0.4s ease;
-}
-
-.radio-input:checked+.radio-label span:first-child:before {
- transform: scale(3.5);
- opacity: 0;
- transition: all 0.6s ease;
-}
-
-
-/* Checkbox */
-
-.checkbox__label {
- @apply select-none cursor-pointer;
-}
-
-.checkbox__label span {
- @apply inline-block align-middle;
- transform: translate3d(0, 0, 0);
-}
-
-.checkbox__label span:first-child {
- @apply relative rounded align-middle border border-secondary-500 bg-white w-4 h-4 mr-3;
- transform: scale(1);
- transition: all 0.2s ease;
-}
-
-.checkbox__label span:first-child svg {
- position: absolute;
- top: 3px;
- left: 2px;
- fill: none;
- stroke: #ffffff;
- stroke-width: 2;
- stroke-linecap: round;
- stroke-linejoin: round;
- stroke-dasharray: 16px;
- stroke-dashoffset: 16px;
- transition: all 0.3s ease;
- transition-delay: 0.1s;
- transform: translate3d(0, 0, 0);
-}
-
-.checkbox__label span:first-child:before {
- content: "";
- @apply bg-primary-500 w-full h-full block opacity-100 rounded-full;
- transform: scale(0);
-}
-
-.checkbox__label:hover span:first-child {
- @apply bg-primary-100 border-primary-500;
-}
-
-.checkbox__input:checked+.checkbox__label span:first-child {
- @apply bg-primary-500 border-primary-500;
- animation: wave 0.4s ease;
-}
-
-.checkbox__input:checked+.checkbox__label span:first-child svg {
- stroke-dashoffset: 0;
-}
-
-.checkbox__input:checked+.checkbox__label span:first-child:before {
- transform: scale(3.5);
- opacity: 0;
- transition: all 0.6s ease;
-}
-
@keyframes wave {
50% {
transform: scale(0.9);
}
}
-label {
- @apply block text-secondary-700 text-sm font-medium;
-}
-
-input {
- @apply border-secondary-300 rounded-md shadow-sm focus:ring-primary-500 focus:border-primary-500 transition-colors duration-300 !important;
-}
-
-input:disabled,
-.disabled {
- @apply cursor-not-allowed bg-secondary-200 border-secondary-400 text-secondary-700;
-}
-
-textarea {
- @apply border-secondary-300 rounded-md shadow-sm focus:ring-primary-500 focus:border-primary-500 transition-colors duration-300;
-}
-
-button:disabled,
-.disabled {
- @apply cursor-not-allowed bg-secondary-300 text-secondary-500 shadow-none border-transparent;
- background-image: none;
-}
-
-
-/* Styling skeleton loading */
-
-.skeleton-placeholder__line-sm {
- @apply rounded-full bg-secondary-100;
- height: 0.625rem;
-}
-
-.skeleton-placeholder__line-md {
- @apply rounded-full bg-secondary-100;
- height: 1rem;
-}
-
-.skeleton-placeholder__image {
- @apply mt-5 h-48 rounded-lg bg-secondary-100;
-}
-
-.skeleton-animate {
- animation: skeletonShimmer 3s infinite linear;
- background: linear-gradient(to right, #f5f3f7 10%, #fbfafc 40%, #f5f3f7 70%);
- background-size: 1000px 100%;
-}
-
-@keyframes skeletonShimmer {
- 0% {
- background-position: -1000px 0;
- }
- 100% {
- background-position: 1000px 0;
- }
-}
-
-.skeleton-animate-alpha {
- animation: skeletonShimmer 3s infinite linear;
- background: linear-gradient(to right, rgba(0, 0, 0, 0.1) 10%, rgba(0, 0, 0, 0.05) 40%, rgba(0, 0, 0, 0.1) 70%);
- background-size: 1000px 100%;
-}
@media print {
@page {
@@ -449,20 +82,6 @@ button:disabled,
}
}
-.header-section .appBar {
- z-index: 1201;
-}
-
-.header-section .toolbar {
- padding-top: 72px;
-}
-
-@media only screen and (min-width: 601px) {
- .header-section .menuButton {
- display: none;
- }
-}
-
.App {
text-align: center;
}
@@ -497,87 +116,10 @@ button:disabled,
100% {opacity: 0;}
}
-.badge {
- display: inline-block;
- padding: 0.25em 0.4em;
- font-size: 12px;
- font-weight: 700;
- line-height: 1;
- text-align: center;
- white-space: nowrap;
- vertical-align: baseline;
- border-radius: 0.25rem;
- transition: color 0.15s;
-}
-
-.badge-pill {
- padding-right: 0.6em;
- padding-left: 0.6em;
- border-radius: 10rem;
-}
-
-.badge-primary {
- color: #fff;
- background-color: #007bff;
-}
-
-.badge-secondary {
- color: #fff;
- background-color: #6c757d;
-}
-
-.badge-success {
- color: #fff;
- background-color: #28a745;
-}
-
-.badge-warning {
- color: #212529;
- background-color: #ffc107;
-}
-
-.badge-danger {
- color: #fff;
- background-color: #dc3545;
-}
-
-.badge-dark {
- color: #fff;
- background-color: #343a40;
-}
-
.dropdown:hover .dropdown-menu {
display: block;
}
-.border-primary {
- border-color: #28a745;
-}
-
-.form-input {
- padding-top: 6px;
- padding-bottom: 6px;
- width: 100%;
- border-radius: 4px;
- height: 38px;
-}
-
-.form-input:focus {
- border-color: #28a745 !important;
- box-shadow: 0 0 0 1px #28a745 !important;
-}
-
-.copied-to-cb {
- color: #28a745;
- font-size: 13px;
- padding-left: 5px;
- font-style: italic;
-}
-
-.copy-to-cb {
- padding-left: 5px;
-}
-
::-webkit-scrollbar {
width: 10px;
height: 8px;
@@ -596,166 +138,6 @@ button:disabled,
background: rgba(0, 0, 0, 0.4);
}
-@media (min-width:1000px) {
- .manualGrid {
- display: grid !important
- }
-}
-
-.scrollbar-hide::-webkit-scrollbar {
- width: 0px;
- height: 0px;
-}
-
-/*
- Range Sliders for Camera Feed
-*/
-
-#feed-range {
- -webkit-appearance: none;
- appearance: none;
- margin: 18px 0;
- width: 100%;
-}
-
-#feed-range:focus {
- outline: none;
-}
-
-#feed-range::-webkit-slider-runnable-track {
- width: 100%;
- height: 1px;
- cursor: pointer;
- background: transparent;
- border-radius: 5px;
-}
-
-#feed-range::-webkit-slider-thumb {
- height: 16px;
- width: 16px;
- border-radius: 3px;
- border: 1px solid white;
- background: black;
- cursor: pointer;
- -webkit-appearance: none;
- margin-top: -8px;
- border-radius: 50%;
-}
-
-@media (min-width:471px) {
- .csv-input {
- display: block;
- font-size: 0.875rem;
- line-height: 1.25rem;
- margin: auto;
- width: 50%;
- }
-}
-
-@media (max-width:470px) {
- .csv-input {
- display: block;
- font-size: 0.875rem;
- line-height: 1.25rem;
- margin: auto;
- width: 100%;
- }
-}
-
-[type="checkbox"] {
- @apply text-primary-500 focus:ring-1 focus:ring-primary-500 focus:outline-none;
-}
-
-
-
-.csv-input::file-selector-button:hover {
- background-color: #84e1bc;
-}
-
-
-
-/* for gmaps search dropdown */
-.pac-container {
- z-index: 100000 !important;
-}
-
-.csv-input::file-selector-button {
- padding-top: 0.5rem;
- padding-bottom: 0.5rem;
- padding-left: 1rem;
- padding-right: 1rem;
- font-size: 0.875rem;
- line-height: 1.25rem;
- font-weight: 600;
- border-width: 0;
- background-color: #def7ec;
- color: #046c4e;
-}
-
-.csv-input::file-selector-button:hover {
- background-color: #84e1bc;
-}
-
-/* Patient Category Styles */
-
-.patient-comfort {
- @apply bg-patient-comfort text-patient-comfort-fore
-}
-.patient-stable {
- @apply bg-patient-stable text-patient-stable-fore
-}
-.patient-abnormal {
- @apply bg-patient-abnormal text-patient-abnormal-fore
-}
-.patient-critical {
- @apply bg-patient-critical text-patient-critical-fore
-}
-.patient-unknown {
- @apply bg-patient-unknown text-patient-unknown-fore
-}
-
-.patient-activelydying {
- @apply bg-patient-activelydying text-patient-activelydying-fore
-}
-
-.patient-comfort-ring {
- @apply ring-patient-comfort
-}
-.patient-stable-ring {
- @apply ring-patient-stable
-}
-.patient-abnormal-ring {
- @apply ring-patient-abnormal
-}
-.patient-critical-ring {
- @apply ring-patient-critical
-}
-.patient-unknown-ring {
- @apply ring-patient-unknown
-}
-.patient-activelydying-ring {
- @apply ring-patient-activelydying
-}
-
-.patient-comfort-profile {
- @apply border-2 border-patient-comfort rounded-t
-}
-.patient-stable-profile {
- @apply border-2 border-patient-stable rounded-t
-}
-.patient-abnormal-profile {
- @apply border-2 border-patient-abnormal rounded-t
-}
-.patient-critical-profile {
- @apply border-2 border-patient-critical rounded-t
-}
-.patient-unknown-profile {
- @apply border border-patient-unknown rounded
-}
-.patient-activelydying-profile {
- @apply border-2 border-patient-activelydying rounded-t
-}
-
/* for gmaps search dropdown */
.pac-container {
z-index: 100000 !important;
@@ -855,468 +237,6 @@ input[type="search"]::-webkit-search-cancel-button,
input[type="search"]::-webkit-search-results-button,
input[type="search"]::-webkit-search-results-decoration { display: none; }
-.service-panel{
- @apply flex-row
-}
-
-@media screen and (max-width: 920px) {
- .service-panel{
- @apply flex-col
- }
-}
-/* styles for files in src/Components/CriticalCareRecording/PressureSore */
-
-input[type="checkbox"]:checked~.dot {
- transform: translateX(100%);
-}
-
-
-/* styles for files in src/Components/CriticalCareRecording/components */
-
-.range {
- position: relative;
- width: 644px;
- height: 5px;
-}
-
-.range input {
- width: 100%;
- position: absolute;
- top: 2px;
- height: 0;
- -webkit-appearance: none;
-}
-
-.range input::-webkit-slider-thumb {
- -webkit-appearance: none;
- width: 18px;
- height: 18px;
- margin: -8px 0 0;
- border-radius: 50%;
- background: rgb(7, 109, 243);
- cursor: pointer;
- border: 0 !important;
- z-index: 10;
-}
-
-.range input::-moz-range-thumb {
- width: 18px;
- height: 18px;
- margin: -8px 0 0;
- border-radius: 50%;
- background: rgb(7, 109, 243);
- cursor: pointer;
- border: 0 !important;
- z-index: 10;
-}
-
-.range input::-ms-thumb {
- width: 18px;
- height: 18px;
- margin: -8px 0 0;
- border-radius: 50%;
- background: rgb(7, 109, 243);
- cursor: pointer;
- border: 0 !important;
- z-index: 10;
-}
-
-.range input::-webkit-slider-runnable-track {
- width: 100%;
- height: 2px;
- cursor: pointer;
- background: #b2b2b2;
- z-index: 1;
-}
-
-.range input::-moz-range-track {
- width: 100%;
- height: 2px;
- cursor: pointer;
- background: black;
- z-index: 1;
-}
-
-.range input::-ms-track {
- width: 100%;
- height: 2px;
- cursor: pointer;
- background: #b2b2b2;
- z-index: 1;
-}
-
-.range input:focus {
- background: none;
- outline: none;
-}
-
-.range input::-ms-track {
- width: 100%;
- cursor: pointer;
- background: transparent;
- border-color: transparent;
- color: transparent;
-}
-
-.range-labels {
- margin: 18px -41px 0;
- padding: 0;
- list-style: none;
-}
-
-.range-labels li {
- position: relative;
- float: left;
- width: 90.25px;
- text-align: center;
- color: black;
- font-size: 14px;
- cursor: pointer;
-}
-
-.range-labels .label::before {
- position: absolute;
- top: -25px;
- right: 0;
- left: 0;
- content: "";
- margin: 0 auto;
- width: 9px;
- height: 9px;
- background: #b2b2b2;
- border-radius: 50%;
-}
-
-.double-range-labels {
- margin: 18px -41px 0;
- padding: 0;
- list-style: none;
-}
-
-.double-range-labels li {
- position: relative;
- float: left;
- width: 45.25px;
- text-align: center;
- color: black;
- font-size: 14px;
- cursor: pointer;
-}
-
-.double-range-labels .label::before {
- position: absolute;
- top: -25px;
- right: 0;
- left: 0;
- content: "";
- margin: 0 auto;
- width: 9px;
- height: 9px;
- background: #b2b2b2;
- border-radius: 50%;
-}
-
-.upper-label {
- height: 10px;
- margin-bottom: 10px;
-}
-
-.pupil1 {
- bottom: 0;
- margin: 0 auto;
- width: 9px;
- height: 9px;
- border-radius: 50%;
- background-color: black;
-}
-
-.pupil2 {
- bottom: 0;
- margin: 0 auto;
- width: 15px;
- height: 15px;
- border-radius: 50%;
- background-color: black;
-}
-
-.pupil3 {
- bottom: 0;
- margin: 0 auto;
- width: 21px;
- height: 21px;
- border-radius: 50%;
- background-color: black;
-}
-
-.pupil4 {
- bottom: 0;
- margin: 0 auto;
- width: 25px;
- height: 25px;
- border-radius: 50%;
- background-color: black;
-}
-
-.pupil5 {
- bottom: 0;
- margin: 0 auto;
- width: 30px;
- height: 30px;
- border-radius: 50%;
- background-color: black;
-}
-
-.pupil6 {
- bottom: 0;
- margin: 0 auto;
- width: 35px;
- height: 35px;
- border-radius: 50%;
- background-color: black;
-}
-
-.pupil7 {
- bottom: 0;
- margin: 0 auto;
- width: 38px;
- height: 38px;
- border-radius: 50%;
- background-color: black;
-}
-
-.pupil8 {
- width: 41px;
- height: 41px;
- border-radius: 50%;
- background-color: black;
-}
-
-.range-labels .active {
- color: rgb(7, 109, 243);
-}
-
-.range-labels .selected::before {
- background: rgb(7, 109, 243);
-}
-
-.range-labels .active.selected::before {
- display: none;
-}
-
-.align-circles {
- position: relative;
- display: flex;
- justify-content: center;
- height: 41px;
- vertical-align: baseline;
-}
-
-input[type="number"] {
- background-color: #fbfafc;
-}
-
-
-/* Copied CSS */
-
-.slider {
- position: relative;
- width: 200px;
-}
-
-.slider__track,
-.slider__range,
-.slider__left-value,
-.slider__right-value {
- position: absolute;
-}
-
-.slider__track,
-.slider__range {
- border-radius: 3px;
- height: 5px;
-}
-
-.slider__track {
- background-color: #1476d8;
- width: 100%;
- z-index: 1;
-}
-
-.slider__range {
- background-color: #19ebe0;
- z-index: 2;
-}
-
-.slider__left-value,
-.slider__right-value {
- color: #1c85ee;
- font-size: 12px;
- margin-top: 20px;
-}
-
-.slider__left-value {
- left: 6px;
-}
-
-.slider__right-value {
- right: -4px;
-}
-
-
-/* Removing the default appearance */
-
-.thumb input {
- pointer-events: none;
- position: absolute;
- height: 0;
- width: 200px;
- outline: none;
-}
-
-.thumb--left {
- z-index: 3;
-}
-
-.thumb--right {
- z-index: 4;
-}
-
-
-/* For Chrome browsers */
-
-.thumb input::-webkit-slider-thumb {
- background-color: #242525;
- border: none;
- border-radius: 50%;
- box-shadow: 0 0 1px 1px #0b2846;
- cursor: pointer;
- height: 18px;
- width: 18px;
- margin-top: 4px;
- pointer-events: all;
- position: relative;
-}
-
-
-/* For Firefox browsers */
-
-.thumb input::-moz-range-thumb {
- background-color: #272b2c;
- border: none;
- border-radius: 50%;
- box-shadow: 0 0 1px 1px #0d2d4d;
- cursor: pointer;
- height: 18px;
- width: 18px;
- margin-top: 4px;
- pointer-events: all;
- position: relative;
-}
-
-.slider {
- appearance: none;
- background-color: #dee0e4;
- width: 100%;
- height: 4px;
- margin: 0;
- padding: 0;
- z-index: 2;
-}
-
-.slider::-webkit-slider-thumb {
- cursor: pointer;
-}
-
-.slider-container {
- position: relative;
- width: 100%;
- /* max-width: 700px; */
- display: flex;
- justify-content: center;
-}
-
-.indicators {
- position: absolute;
- top: -200%;
- width: 100%;
- height: 20px;
- border-left: 2px solid #dee0e4;
-}
-
-.tick {
- content: "";
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- background: linear-gradient(to left, #dee0e4 2px, transparent 2px);
-}
-
-.slider-box {
- width: 100%;
- /* max-width: 700px; */
- padding: 20px 10px 60px 10px;
- border-radius: 12px;
-}
-
-.slider-head {
- font-family: sans-serif;
- margin-bottom: 2rem;
-}
-
-.slider-head>div>h1 {
- font-size: 1rem;
- font-weight: bold;
-}
-
-.slider-head input {
- padding: 0.5rem 0.7rem;
- border-radius: 8px;
- border: 1px solid #979aa0;
- margin-left: 12px;
- font-size: 1.1rem;
- color: #383a3e;
- letter-spacing: 1px;
-}
-
-.slider-head label {
- font-weight: 700;
- color: #2856ff;
- font-size: 1rem;
-}
-
-
-.grid-2-col, .grid-3-col, .grid-2-1-col, .grid-3-1-col, .grid-1-2-col {
- display: grid;
- grid-template-columns: 1fr;
- gap: 1.5rem;
-}
-
-@media (min-width: 768px) {
- .grid-2-col {
- grid-template-columns: repeat(2, 1fr);
- }
- .grid-3-col {
- grid-template-columns: repeat(3, 1fr);
- }
- .grid-2-1-col {
- grid-template-columns: 2fr 1fr;
- }
- .grid-1-2-col {
- grid-template-columns: 1fr 2fr;
- }
-}
-
-.input-field-group {
- display: flex;
- flex-direction: column;
- gap: 0.5rem;
-}
-.col-span-all {
- grid-column: 1 / -1;
-}
-
@layer base {
:root {
--radius: 0.5rem;
diff --git a/src/types/emr/medicationAdministration/medicationAdministration.ts b/src/types/emr/medicationAdministration/medicationAdministration.ts
index db45449679f..caf6f254711 100644
--- a/src/types/emr/medicationAdministration/medicationAdministration.ts
+++ b/src/types/emr/medicationAdministration/medicationAdministration.ts
@@ -92,4 +92,6 @@ export interface MedicationAdministrationRead {
dose?: DosageQuantity;
rate?: Quantity;
};
+ created_by: UserBareMinimum;
+ updated_by: UserBareMinimum;
}
diff --git a/src/types/emr/medicationAdministration/medicationAdministrationApi.ts b/src/types/emr/medicationAdministration/medicationAdministrationApi.ts
index 77e37c391e2..35b980b0349 100644
--- a/src/types/emr/medicationAdministration/medicationAdministrationApi.ts
+++ b/src/types/emr/medicationAdministration/medicationAdministrationApi.ts
@@ -7,12 +7,12 @@ import {
} from "./medicationAdministration";
export default {
- listMedicationAdministrations: {
+ list: {
path: "/api/v1/patient/{patientId}/medication/administration/",
method: HttpMethod.GET,
TRes: Type>(),
},
- upsertMedicationAdministration: {
+ upsert: {
path: "/api/v1/patient/{patientId}/medication/administration/upsert/",
method: HttpMethod.POST,
TRes: Type,
diff --git a/src/types/emr/medicationStatement/medicationStatementApi.ts b/src/types/emr/medicationStatement/medicationStatementApi.ts
index 68736e4ab13..7f65dc5f3c8 100644
--- a/src/types/emr/medicationStatement/medicationStatementApi.ts
+++ b/src/types/emr/medicationStatement/medicationStatementApi.ts
@@ -1,12 +1,12 @@
import { Type } from "@/Utils/request/api";
import { PaginatedResponse } from "@/Utils/request/types";
-import { MedicationStatement } from "@/types/emr/medicationStatement";
+import { MedicationStatementRead } from "@/types/emr/medicationStatement";
const medicationStatementApi = {
list: {
path: "/api/v1/patient/{patientId}/medication/statement/",
method: "GET",
- TRes: Type>(),
+ TRes: Type>(),
},
} as const;
diff --git a/src/vite-env.d.ts b/src/vite-env.d.ts
index defba258b80..5e2066155a8 100644
--- a/src/vite-env.d.ts
+++ b/src/vite-env.d.ts
@@ -19,11 +19,7 @@ interface ImportMetaEnv {
readonly REACT_CUSTOM_LOGO_ALT?: string;
readonly REACT_CUSTOM_DESCRIPTION?: string;
readonly REACT_GMAPS_API_KEY?: string;
- readonly REACT_GOV_DATA_API_KEY?: string;
readonly REACT_RECAPTCHA_SITE_KEY?: string;
- readonly REACT_WARTIME_SHIFTING?: string;
- readonly REACT_STILL_WATCHING_IDLE_TIMEOUT?: string;
- readonly REACT_STILL_WATCHING_PROMPT_DURATION?: string;
readonly REACT_JWT_TOKEN_REFRESH_INTERVAL?: string;
readonly REACT_MIN_ENCOUNTER_DATE?: string;
readonly REACT_DEFAULT_ENCOUNTER_TYPE?: string;
diff --git a/vite.config.mts b/vite.config.mts
index 749f188002c..308c942b7ad 100644
--- a/vite.config.mts
+++ b/vite.config.mts
@@ -288,6 +288,7 @@ export default defineConfig(({ mode }) => {
server: {
port: 4000,
host: "0.0.0.0",
+ allowedHosts: true,
},
preview: {
headers: {