Merge branch 'develop' into nice_dev

src/modules/04_registry/components/Profile.vue

@@ -231,7 +231,7 @@
                 </q-item-section>
                 <q-item-section>ให้ออกจากราชการ</q-item-section>
               </q-item>
-              <q-separator />
+              <!-- <q-separator />
               <q-item
                 clickable
                 v-close-popup
@@ -252,7 +252,7 @@
                 <q-item-section style="min-width: 0px" avatar class="q-py-sm">
                 </q-item-section>
                 <q-item-section>ไล่ออกจากราชการ</q-item-section>
-              </q-item>
+              </q-item> -->
               <q-separator />
               <q-item
                 clickable

src/modules/11_discipline/components/3_InvestigateDisciplinary/CalandarDialog.vue

@@ -77,23 +77,10 @@ const dateMonth = ref<DataDateMonthObject>({
   year: new Date().getFullYear(),
 });
 
-/** function เรียกข่อมูล calendar*/
-function getRandomColor() {
-  return (
-    "hsl(" +
-    360 * Math.random() +
-    "," +
-    (25 + 70 * Math.random()) +
-    "%," +
-    (85 + 10 * Math.random()) +
-    "%)"
-  );
-}
-
 async function fetchCalendar() {
   showLoader();
-  const defaultColor = "#E3FDDA";
-  const gradientColors = generateGradientColors(props.lists.length);
+  const defaultColor = "#e3fdda";
+  const gradientColors = '#f7d0dd'
 
   const events = await props.lists.map(
     (e: ExtendHistoryObject, index: number) => ({
@@ -104,7 +91,7 @@ async function fetchCalendar() {
       allDay: false,
       color:
         props.lists.length > 1 && index > 0
-          ? gradientColors[index]
+          ? gradientColors
           : defaultColor,
     })
   );
@@ -120,13 +107,6 @@ async function fetchCalendar() {
   }, 1000);
 }
 
-function generateGradientColors(length: number) {
-  const colors = [];
-  for (let i = 0; i < length; i++) {
-    colors.push(getRandomColor());
-  }
-  return colors;
-}
 
 /**
  * function convert เดือนปี