diff --git a/src/components/base/BasePagination.vue b/src/components/base/BasePagination.vue
new file mode 100644
index 0000000..abcea0a
--- /dev/null
+++ b/src/components/base/BasePagination.vue
@@ -0,0 +1,35 @@
+<template lang="pug">
+  .flex(class="q-pa-lg flex-center")
+    q-pagination(
+      v-model="value",
+      :max="max",
+      :max-pages="maxPages",
+      :boundary-numbers="boundaryNumbers",
+      :direction-links="directionLinks"
+    )
+</template>
+
+<script>
+export default {
+  name: "BasePagination",
+  props: {
+    value: Number,
+    max: {
+      default: 1,
+      type: Number,
+    },
+    maxPages: {
+      default: 6,
+      type: Number,
+    },
+    boundaryNumbers: {
+      default: false,
+      type: Boolean,
+    },
+    directionLinks: {
+      default: false,
+      type: Boolean,
+    },
+  },
+};
+</script>
diff --git a/src/pages/clients/components/ClientsTable.vue b/src/pages/clients/components/ClientsTable.vue
index b30929f..a69f0df 100644
--- a/src/pages/clients/components/ClientsTable.vue
+++ b/src/pages/clients/components/ClientsTable.vue
@@ -43,6 +43,11 @@
           @next-page="switchNextPage",
           @set-current-page="changeCurrentTablePage"
         )
+        //- base-pagination(
+        //-   :max="paginationInfo.length",
+        //-   :value="currentTablePage",
+        //-   directionLinks
+        //- )
         base-modal(
           v-model="showModal",
           :title="titleModal",
@@ -69,6 +74,7 @@ import BaseModal from "@/components/base/BaseModal.vue";
 import ClientTableModal from "./ClientTableModal.vue";
 import FormCreateMedicalCard from "@/pages/clients/components/FormCreateMedicalCard";
 import BaseLoader from "@/components/Loader/BaseLoader.vue";
+import BasePagination from "@/components/base/BasePagination.vue";
 export default {
   name: "ClientsTable",
   components: {
@@ -82,6 +88,7 @@ export default {
     ClientTableModal,
     FormCreateMedicalCard,
     BaseLoader,
+    BasePagination,
   },
   props: {
     openForm: Function,
diff --git a/src/pages/schedule/TheSchedule.vue b/src/pages/schedule/TheSchedule.vue
index 57b7b6f..a6b3f96 100644
--- a/src/pages/schedule/TheSchedule.vue
+++ b/src/pages/schedule/TheSchedule.vue
@@ -330,8 +330,10 @@ export default {
         (e) =>
           e.date === moment(this.replacementSheet.date).format("YYYY-MM-DD")
       );
-      this.replacementSheet.start_time = dateSchedule?.start_time;
-      this.replacementSheet.end_time = dateSchedule?.end_time;
+      if (dateSchedule?.start_time) {
+        this.replacementSheet.start_time = dateSchedule?.start_time;
+        this.replacementSheet.end_time = dateSchedule?.end_time;
+      }
     },
   },
   watch: {
diff --git a/src/pages/schedule/components/ScheduleTable.vue b/src/pages/schedule/components/ScheduleTable.vue
index f0be4eb..cc6dd9b 100644
--- a/src/pages/schedule/components/ScheduleTable.vue
+++ b/src/pages/schedule/components/ScheduleTable.vue
@@ -81,10 +81,9 @@ export default {
       this.setActiveButton();
       return {
         "--bg-color-status": this.activeButton?.color,
-        "--text-status":
-          !this.template.item?.symbol && this.activeCell
-            ? this.activeButton?.text
-            : this.template.item?.symbol,
+        "--text-status": !this.template.item?.symbol
+          ? this.activeButton?.text
+          : this.template.item?.symbol,
       };
     },
   },
@@ -173,7 +172,7 @@ export default {
         return {
           "set-template":
             !!this.template.item?.label && this.setActiveTemplate(),
-          status: !!this.activeButton && this.activeCell,
+          status: !!this.activeButton,
           "set-date": !this.activeButton && this.activeCell,
         };
       }