From 5aae34dba0d488b21838e9dbf876b876bd59e78d Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Thu, 2 Nov 2023 17:05:38 +0700 Subject: [PATCH 1/7] Update CSS styles and inline radio group component --- src/assets/css/style.css | 172 ++++++++++------------- src/components/Form/InlineRadioGroup.vue | 23 +-- 2 files changed, 83 insertions(+), 112 deletions(-) diff --git a/src/assets/css/style.css b/src/assets/css/style.css index cfef93b..a47375b 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -705,6 +705,40 @@ select { --tw-backdrop-sepia: ; } +.container { + width: 100%; +} + +@media (min-width: 640px) { + .container { + max-width: 640px; + } +} + +@media (min-width: 768px) { + .container { + max-width: 768px; + } +} + +@media (min-width: 1024px) { + .container { + max-width: 1024px; + } +} + +@media (min-width: 1280px) { + .container { + max-width: 1280px; + } +} + +@media (min-width: 1536px) { + .container { + max-width: 1536px; + } +} + /* NavBar */ .menu-item { @@ -1051,10 +1085,6 @@ select { margin-right: 0.5rem; } -.mr-2\.5 { - margin-right: 0.625rem; -} - .mt-0 { margin-top: 0px; } @@ -1170,10 +1200,6 @@ select { height: 2.25rem; } -.h-\[16px\] { - height: 16px; -} - .h-\[2\.7rem\] { height: 2.7rem; } @@ -1182,10 +1208,6 @@ select { height: 66px; } -.h-\[7px\] { - height: 7px; -} - .h-\[calc\(100\%-64px\)\] { height: calc(100% - 64px); } @@ -1283,10 +1305,6 @@ select { width: 2.25rem; } -.w-\[16px\] { - width: 16px; -} - .w-\[2\.7rem\] { width: 2.7rem; } @@ -1295,10 +1313,6 @@ select { width: 266px; } -.w-\[7px\] { - width: 7px; -} - .w-auto { width: auto; } @@ -1500,6 +1514,19 @@ select { gap: 0.75rem; } +.gap-x-6 { + -moz-column-gap: 1.5rem; + column-gap: 1.5rem; +} + +.gap-y-0 { + row-gap: 0px; +} + +.gap-y-0\.5 { + row-gap: 0.125rem; +} + .gap-x-1 { -moz-column-gap: 0.25rem; column-gap: 0.25rem; @@ -1515,24 +1542,6 @@ select { column-gap: 0.5rem; } -.gap-x-4 { - -moz-column-gap: 1rem; - column-gap: 1rem; -} - -.gap-x-6 { - -moz-column-gap: 1.5rem; - column-gap: 1.5rem; -} - -.gap-y-0 { - row-gap: 0px; -} - -.gap-y-0\.5 { - row-gap: 0.125rem; -} - .gap-y-1 { row-gap: 0.25rem; } @@ -1693,11 +1702,6 @@ select { border-color: rgb(209 213 219 / var(--tw-border-opacity)); } -.border-gray-600 { - --tw-border-opacity: 1; - border-color: rgb(75 85 99 / var(--tw-border-opacity)); -} - .border-primary-500 { --tw-border-opacity: 1; border-color: rgb(3 91 113 / var(--tw-border-opacity)); @@ -1707,6 +1711,11 @@ select { border-color: transparent; } +.border-gray-600 { + --tw-border-opacity: 1; + border-color: rgb(75 85 99 / var(--tw-border-opacity)); +} + .bg-black { --tw-bg-opacity: 1; background-color: rgb(0 0 0 / var(--tw-bg-opacity)); @@ -1903,6 +1912,10 @@ select { padding: 1rem; } +.p-5 { + padding: 1.25rem; +} + .px-0 { padding-left: 0px; padding-right: 0px; @@ -1948,11 +1961,6 @@ select { padding-right: 1.5rem; } -.py-0 { - padding-top: 0px; - padding-bottom: 0px; -} - .py-1 { padding-top: 0.25rem; padding-bottom: 0.25rem; @@ -1998,6 +2006,11 @@ select { padding-bottom: 1.5rem; } +.py-0 { + padding-top: 0px; + padding-bottom: 0px; +} + .pb-4 { padding-bottom: 1rem; } @@ -2014,10 +2027,6 @@ select { padding-left: 2.75rem; } -.pl-2 { - padding-left: 0.5rem; -} - .pl-3 { padding-left: 0.75rem; } @@ -2042,10 +2051,6 @@ select { padding-right: 1.25rem; } -.pr-7 { - padding-right: 1.75rem; -} - .pt-0 { padding-top: 0px; } @@ -2062,6 +2067,14 @@ select { padding-top: 1.25rem; } +.pl-2 { + padding-left: 0.5rem; +} + +.pr-7 { + padding-right: 1.75rem; +} + .text-left { text-align: left; } @@ -2314,11 +2327,6 @@ select { color: rgb(153 153 0 / var(--tw-text-opacity)); } -.text-primary-600 { - --tw-text-opacity: 1; - color: rgb(2 73 90 / var(--tw-text-opacity)); -} - .text-opacity-40 { --tw-text-opacity: 0.4; } @@ -2767,20 +2775,10 @@ select { color: rgb(53 124 141 / var(--tw-text-opacity)); } -.group:checked .group-checked\:text-primary-500 { - --tw-text-opacity: 1; - color: rgb(3 91 113 / var(--tw-text-opacity)); -} - .group:hover .group-hover\:block { display: block; } -.group:hover .group-hover\:bg-gray-300 { - --tw-bg-opacity: 1; - background-color: rgb(209 213 219 / var(--tw-bg-opacity)); -} - .group:hover .group-hover\:bg-primary-500 { --tw-bg-opacity: 1; background-color: rgb(3 91 113 / var(--tw-bg-opacity)); @@ -2813,16 +2811,6 @@ select { color: rgb(255 255 255 / var(--tw-text-opacity)); } -.peer:checked ~ .peer-checked\:border-primary-500 { - --tw-border-opacity: 1; - border-color: rgb(3 91 113 / var(--tw-border-opacity)); -} - -.peer:checked ~ .peer-checked\:bg-primary-500 { - --tw-bg-opacity: 1; - background-color: rgb(3 91 113 / var(--tw-bg-opacity)); -} - .peer:checked ~ .peer-checked\:text-primary-500 { --tw-text-opacity: 1; color: rgb(3 91 113 / var(--tw-text-opacity)); @@ -3063,22 +3051,16 @@ select { gap: 0.75rem; } - .sm\:space-x-10 > :not([hidden]) ~ :not([hidden]) { - --tw-space-x-reverse: 0; - margin-right: calc(2.5rem * var(--tw-space-x-reverse)); - margin-left: calc(2.5rem * calc(1 - var(--tw-space-x-reverse))); - } - .sm\:space-x-4 > :not([hidden]) ~ :not([hidden]) { --tw-space-x-reverse: 0; margin-right: calc(1rem * var(--tw-space-x-reverse)); margin-left: calc(1rem * calc(1 - var(--tw-space-x-reverse))); } - .sm\:space-y-0 > :not([hidden]) ~ :not([hidden]) { - --tw-space-y-reverse: 0; - margin-top: calc(0px * calc(1 - var(--tw-space-y-reverse))); - margin-bottom: calc(0px * var(--tw-space-y-reverse)); + .sm\:space-x-10 > :not([hidden]) ~ :not([hidden]) { + --tw-space-x-reverse: 0; + margin-right: calc(2.5rem * var(--tw-space-x-reverse)); + margin-left: calc(2.5rem * calc(1 - var(--tw-space-x-reverse))); } .sm\:space-x-5 > :not([hidden]) ~ :not([hidden]) { @@ -3087,10 +3069,10 @@ select { margin-left: calc(1.25rem * calc(1 - var(--tw-space-x-reverse))); } - .sm\:space-x-8 > :not([hidden]) ~ :not([hidden]) { - --tw-space-x-reverse: 0; - margin-right: calc(2rem * var(--tw-space-x-reverse)); - margin-left: calc(2rem * calc(1 - var(--tw-space-x-reverse))); + .sm\:space-y-0 > :not([hidden]) ~ :not([hidden]) { + --tw-space-y-reverse: 0; + margin-top: calc(0px * calc(1 - var(--tw-space-y-reverse))); + margin-bottom: calc(0px * var(--tw-space-y-reverse)); } .sm\:space-x-reverse > :not([hidden]) ~ :not([hidden]) { diff --git a/src/components/Form/InlineRadioGroup.vue b/src/components/Form/InlineRadioGroup.vue index cad4cf1..6672c35 100644 --- a/src/components/Form/InlineRadioGroup.vue +++ b/src/components/Form/InlineRadioGroup.vue @@ -2,23 +2,12 @@
-
- + - + class="w-4 h-4 border-gray-300 text-primary-500 peer focus:ring-primary-500" /> +
@@ -26,7 +15,7 @@ \ No newline at end of file From dd766b1108cf774c1699de7456122b952510a977 Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Fri, 3 Nov 2023 09:07:57 +0700 Subject: [PATCH 5/7] Add columns for No. Laporan, Tgl Lapor, IDPEL/NO METER, Nama Pelapor, Alamat Pelapor, No Tlp Pelapor, Status, UI Dist., UP 3, Posko/ULP, Petugas, and Keterangan DLPD to Table_71.vue --- .../Pages/PencarianData/Table_71.vue | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/components/Pages/PencarianData/Table_71.vue b/src/components/Pages/PencarianData/Table_71.vue index b96b3c4..320a9cc 100644 --- a/src/components/Pages/PencarianData/Table_71.vue +++ b/src/components/Pages/PencarianData/Table_71.vue @@ -13,17 +13,23 @@ + + + caption="IDPEL/NO METER" /> - + caption="Nama Pelapor" /> - - - + caption="Alamat Pelapor" /> + + + + + + +
From 61d117c79bfcac5f9b241e43b70dfefcfc5f3e9b Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Fri, 3 Nov 2023 09:14:08 +0700 Subject: [PATCH 6/7] Remove Type16 filter from MenuProvider.vue --- src/components/Pages/MenuProvider.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/Pages/MenuProvider.vue b/src/components/Pages/MenuProvider.vue index 023b7b3..153891f 100644 --- a/src/components/Pages/MenuProvider.vue +++ b/src/components/Pages/MenuProvider.vue @@ -48,7 +48,6 @@ import Type12 from '../Form/FiltersType/Type12.vue'; import Type13 from '../Form/FiltersType/Type13.vue'; import Type14 from '../Form/FiltersType/Type14.vue'; import Type15 from '../Form/FiltersType/Type15.vue'; -import Type16 from '../Form/FiltersType/Type16.vue'; import Type17 from '../Form/FiltersType/Type17.vue'; import { useFiltersStore } from '@/stores/filters'; From 846f5bb501f5554039673a6760fa1390d2dc6f4e Mon Sep 17 00:00:00 2001 From: Dede Fuji Abdul Date: Fri, 3 Nov 2023 12:40:40 +0700 Subject: [PATCH 7/7] update --- src/assets/css/style.css | 4 ++ src/components/DatePicker.vue | 30 +++++--------- src/components/Form/FiltersType/index.ts | 17 ++++++++ src/components/Pages/Gangguan/Table_9.vue | 50 ++++++++++++++++++++++- 4 files changed, 81 insertions(+), 20 deletions(-) create mode 100644 src/components/Form/FiltersType/index.ts diff --git a/src/assets/css/style.css b/src/assets/css/style.css index 30b0ad8..c96e4db 100644 --- a/src/assets/css/style.css +++ b/src/assets/css/style.css @@ -962,6 +962,10 @@ select { z-index: 50; } +.z-\[9999\] { + z-index: 9999; +} + .order-last { order: 9999; } diff --git a/src/components/DatePicker.vue b/src/components/DatePicker.vue index 4792bd4..cc1d05c 100644 --- a/src/components/DatePicker.vue +++ b/src/components/DatePicker.vue @@ -1,30 +1,22 @@ \ No newline at end of file