Skip to content

M
myAppraisal
Commit 07d1bcbb by kantavee
Options

Merge branch 'DEV' of https://mygit.myhr.co.th/angular/myAppraisal into DEV

parents 08fb0ebd f783c626
Showing with 48 additions and 38 deletions
angular.json
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
"bezier-easing", "bezier-easing",
"@ckeditor/ckeditor5-build-classic" "@ckeditor/ckeditor5-build-classic"
], ],
"outputPath": "preview", "outputPath": "dist/",
"index": "src/index.html", "index": "src/index.html",
"main": "src/main.ts", "main": "src/main.ts",
"polyfills": ["zone.js"], "polyfills": ["zone.js"],
...@@ -151,4 +151,3 @@ ...@@ -151,4 +151,3 @@
"analytics": "4dc31a42-29bc-451f-966d-aee6138b4cdb" "analytics": "4dc31a42-29bc-451f-966d-aee6138b4cdb"
} }
} }
\ No newline at end of file
src/app/components/name-registration/competency-topic/competency-topic.component.html
<div class="flex justify-between pt-1rem w-full"> <div class="header-title-type">
<!-- div แรกจะอยู่ซ้าย --> <div class="flex justify-between">
<div class="flex"> <div class="flex">
<!-- Content ของ div แรก --> <!-- Content ของ div แรก -->
<div class="flex gap-x-6"> <div class="flex gap-x-6">
...@@ -11,26 +11,27 @@ ...@@ -11,26 +11,27 @@
<div class="flex items-center"> <div class="flex items-center">
<i (click)="toggleCheckbox()" [ngClass]="{'ri-checkbox-multiple-line': !isChecked, 'ri-checkbox-multiple-fill': isChecked}" <i (click)="toggleCheckbox()" [ngClass]="{'ri-checkbox-multiple-line': !isChecked, 'ri-checkbox-multiple-fill': isChecked}"
class="ri-checkbox-multiple-line text-gray-500 dark:text-white/70"></i> class="ri-checkbox-multiple-line text-gray-500 dark:text-white/70"></i>
<label for="hs-checkbox-group-2" class="text-sm text-gray-500 ltr:ml-2 rtl:mr-2 dark:text-white/70">Select All</label> <label for="hs-checkbox-group-2" class="text-sm text-gray-500 ltr:ml-2 rtl:mr-2 dark:text-white/70" (click)="toggleCheckbox()">Select All</label>
</div> </div>
</div> </div>
</div> </div>
<!-- div ที่สองจะอยู่ขวา -->
<div class="flex justify-end"> <div class="flex justify-end">
<div class="px-1"> <div class="px-1">
<div class="relative shadow-md"> <div class="relative shadow-md">
<input type="text" id="hs-leading-icon" name="hs-leading-icon" <input type="text" id="hs-leading-icon" name="hs-leading-icon"
class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10" placeholder="Search by No. or Name" style="height: 40px;"> class="ti-form-input ltr:pl-11 rtl:pr-11 focus:z-10 " placeholder="Search by No. or Name" style="height: 40px;">
<div class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4"> <div
class="absolute inset-y-0 ltr:left-0 rtl:right-0 flex items-center pointer-events-none z-20 ltr:pl-4 rtl:pr-4">
<i class="ri-search-line text-gray"></i> <i class="ri-search-line text-gray"></i>
</div> </div>
</div> </div>
</div> </div>
<div class="px-1"> <div class="px-1">
<button type="button" class="ti-btn bg-pink-500/10 text-pink-500 hover:text-white hover:bg-pink-500 ring-offset-white focus:ring-pink-500 dark:focus:ring-offset-white/10 h-20px m-0 shadow-md"> <button type="button" class="ti-btn ti-btn bg-pink-500/10 text-pink-500 hover:text-white hover:bg-pink-500 ring-offset-white focus:ring-pink-500 dark:focus:ring-offset-white/10 h-20px m-0 shadow-md"
<i class="ri-file-add-line"></i> data-hs-overlay="#competency-topic-modal-add">
<i class="ti ti-file-plus"></i>
import import
</button> </button>
</div> </div>
...@@ -55,10 +56,11 @@ ...@@ -55,10 +56,11 @@
</button> </button>
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="page px-rem mt-7"> <div class="page px-rem">
<div class="overflow-auto table-bordered" style="border-radius: 5px;"> <div class="overflow-auto table-bordered" style="border-radius: 5px;">
<div id="card-type-1" role="tabpanel" aria-labelledby="card-type-item-1"> <div id="card-type-1" role="tabpanel" aria-labelledby="card-type-item-1">
<div class="overflow-auto shadow-md"> <div class="overflow-auto shadow-md">
......
src/app/components/name-registration/competency-topic/competency-topic.component.scss
...@@ -103,3 +103,11 @@ a.custom-link { ...@@ -103,3 +103,11 @@ a.custom-link {
.ti-modal { .ti-modal {
overflow: hidden; overflow: hidden;
} }
.header-title-type {
width: 100%;
min-height: 50px; /* ใช้ min-height เพื่อให้มีความยืดหยุ่น */
margin-top: 10px;
margin-bottom: 10px;
justify-content: space-between; /* จัดเรียงองค์ประกอบภายใน */
align-items: center; /* จัดกลางแนวตั้ง */
}
\ No newline at end of file
src/app/components/name-registration/type-registration/type-registration.component.html
<div class="header-title-type"> <div class="header-title-type">
<div class="flex justify-between"> <div class="flex justify-between">
<div class="flex"> <div class="flex">
<div class="box-body"> <!-- Content ของ div แรก -->
<div class="grid sm:grid-cols-2 gap-2"> <div class="flex gap-x-6">
<label class="p-3 flex w-full bg-white border border-transparent rounded-md text-sm focus:border-primary focus:ring-primary dark:bg-bgdark dark:border-white/10 dark:text-white/70"> <div class="flex items-center">
<input type="checkbox" class="ti-form-checkbox mt-0.5 pointer-events-none" style="transform: scale(0.8);" id="hs-checkbox-checked-in-form"> <input type="checkbox" class="ti-form-checkbox mt-0.5" id="hs-checkbox-group-1">
<span class="text-sm text-gray-500 ltr:ml-2 rtl:mr-2 dark:text-white/70" style="color: #d3d3d3;">Selected</span> <label for="hs-checkbox-group-1" class="text-sm text-gray-500 ltr:ml-2 rtl:mr-2 dark:text-white/70">0 Selected</label>
</label> </div>
<label class="p-3 flex w-full bg-white border border-transparent rounded-md text-sm focus:border-primary focus:ring-primary dark:bg-bgdark dark:border-white/10 dark:text-white/70"> <div class="flex items-center">
<i (click)="toggleCheckbox()" [ngClass]="{'ri-checkbox-multiple-line': !isChecked, 'ri-checkbox-multiple-fill': isChecked}" <i (click)="toggleCheckbox()" [ngClass]="{'ri-checkbox-multiple-line': !isChecked, 'ri-checkbox-multiple-fill': isChecked}"
class="ri-checkbox-multiple-line text-gray-300 dark:text-white/70"></i> class="ri-checkbox-multiple-line text-gray-500 dark:text-white/70"></i>
<span class="text-sm text-gray-500 ltr:ml-2 rtl:mr-2 dark:text-white/100" style="color: #d3d3d3;">Select All</span> <label for="hs-checkbox-group-2" class="text-sm text-gray-500 ltr:ml-2 rtl:mr-2 dark:text-white/70" (click)="toggleCheckbox()">Select All</label>
</label>
</div> </div>
</div> </div>
</div> </div>
...@@ -183,16 +183,16 @@ ...@@ -183,16 +183,16 @@
</div> </div>
</div> </div>
<div class="ti-modal-body" style="padding-top: 0px;"> <div class="ti-modal-body" style="padding-top: 0px;">
<label for="input-label" class="ti-form-label mt-1rem" style="color: #878787;">รหัส *</label> <label for="input-label" class="ti-form-label mt-1rem">รหัส *</label>
<input type="text" id="input-label" class="ti-form-input w-1/2"> <input type="text" id="input-label" class="ti-form-input w-1/2">
<label for="detail_th" class="ti-form-label mt-1rem" style="color: #878787;">ชื่อประเภท (ไทย)*</label> <label for="detail_th" class="ti-form-label mt-1rem">ชื่อประเภท (ไทย)*</label>
<input type="text" id="detail_th" class="ti-form-input w-2/3"> <input type="text" id="detail_th" class="ti-form-input w-2/3">
<label for="detail_eng" class="ti-form-label mt-1rem" style="color: #878787;">ชื่อประเภท (อังกฤษ)</label> <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อประเภท (อังกฤษ)</label>
<input type="text" id="detail_eng" class="ti-form-input w-2/3"> <input type="text" id="detail_eng" class="ti-form-input w-2/3">
<label for="detail_eng" class="ti-form-label mt-1rem" style="color: #878787;">ชื่อย่อ *</label> <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อย่อ *</label>
<input type="text" id="detail_eng" class="ti-form-input w-2/3"> <input type="text" id="detail_eng" class="ti-form-input w-2/3">
<label for="detail_eng" class="ti-form-label mt-1rem" style="color: #878787;">ระดับความคาดหวัง *</label> <label for="detail_eng" class="ti-form-label mt-1rem">ระดับความคาดหวัง *</label>
<input type="text" id="detail_eng" class="ti-form-input w-1/4"> <input type="text" id="detail_eng" class="ti-form-input" style="width: 200px;" >
<div class="flex justify-end mt-2rem mb-1rem"> <div class="flex justify-end mt-2rem mb-1rem">
<button type="button" <button type="button"
class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10" class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
...@@ -252,16 +252,16 @@ ...@@ -252,16 +252,16 @@
</div> </div>
</div> </div>
<div class="ti-modal-body" style="padding-top: 0px;"> <div class="ti-modal-body" style="padding-top: 0px;">
<label for="input-label" class="ti-form-label mt-1rem" style="color: #878787;">รหัส *</label> <label for="input-label" class="ti-form-label mt-1rem">รหัส *</label>
<input type="text" id="input-label" class="ti-form-input w-1/2"> <input type="text" id="input-label" class="ti-form-input w-1/2">
<label for="detail_th" class="ti-form-label mt-1rem" style="color: #878787;">ชื่อประเภท (ไทย)*</label> <label for="detail_th" class="ti-form-label mt-1rem">ชื่อประเภท (ไทย)*</label>
<input type="text" id="detail_th" class="ti-form-input w-2/3"> <input type="text" id="detail_th" class="ti-form-input w-2/3">
<label for="detail_eng" class="ti-form-label mt-1rem" style="color: #878787;">ชื่อประเภท (อังกฤษ)</label> <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อประเภท (อังกฤษ)</label>
<input type="text" id="detail_eng" class="ti-form-input w-2/3"> <input type="text" id="detail_eng" class="ti-form-input w-2/3">
<label for="detail_eng" class="ti-form-label mt-1rem" style="color: #878787;">ชื่อย่อ *</label> <label for="detail_eng" class="ti-form-label mt-1rem">ชื่อย่อ *</label>
<input type="text" id="detail_eng" class="ti-form-input w-2/3"> <input type="text" id="detail_eng" class="ti-form-input w-2/3">
<label for="detail_eng" class="ti-form-label mt-1rem" style="color: #878787;">ระดับความคาดหวัง *</label> <label for="detail_eng" class="ti-form-label mt-1rem">ระดับความคาดหวัง *</label>
<input type="text" id="detail_eng" class="ti-form-input w-1/4"> <input type="text" id="detail_eng" class="ti-form-input" style="width: 200px;">
<div class="flex justify-end mt-2rem mb-1rem"> <div class="flex justify-end mt-2rem mb-1rem">
<button type="button" <button type="button"
class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10" class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
<div class="flex justify-end mt-2rem mb-1rem"> <div class="flex justify-end mt-2rem mb-1rem">
<button type="button" <button type="button"
class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10" class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
data-hs-overlay="#type-registration-component-alert-modal"> data-hs-overlay="#type-registration-component-modal-add">
ย้อนกลับ ย้อนกลับ
</button> </button>
<a class="ti-btn ti-btn-success" href="javascript:void(0);" <a class="ti-btn ti-btn-success" href="javascript:void(0);"
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
<div class="flex justify-end mt-2rem mb-1rem"> <div class="flex justify-end mt-2rem mb-1rem">
<button type="button" <button type="button"
class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10" class="hs-dropdown-toggle ti-btn ti-border font-medium bg-white text-gray-700 shadow-sm align-middle hover:bg-gray-50 focus:ring-offset-white focus:ring-primary dark:bg-bgdark dark:hover:bg-black/20 dark:border-white/10 dark:text-white/70 dark:hover:text-white dark:focus:ring-offset-white/10"
data-hs-overlay="#type-registration-component-alert-edit-modal"> data-hs-overlay="#type-registration-component-modal-edit">
ย้อนกลับ ย้อนกลับ
</button> </button>
<a class="ti-btn ti-btn-success" href="javascript:void(0);" <a class="ti-btn ti-btn-success" href="javascript:void(0);"
......
src/index.html
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<base href="/" /> <base href="/" />
<!-- <base href="/synto/preview/" /> --> <!-- <base href="/synto/preview/" /> -->
<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" /> <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no" />
<meta name="description" content="synto - Angular Admin &amp; Dashboard Template"> <meta name="description" content="APSPlus - Angular Project &amp; by myHR">
<meta name="author" content="Spruko Technologies Private Limited"> <meta name="author" content="Spruko Technologies Private Limited">
<meta name="keywords" content="synto, synto admin, synto dashboard, angular dashboard, angular16, templates, admin, dashboard, angular admin panel, angular admin dashboard, dashboard in angular, angular admin, admin dashboard angular, <meta name="keywords" content="synto, synto admin, synto dashboard, angular dashboard, angular16, templates, admin, dashboard, angular admin panel, angular admin dashboard, dashboard in angular, angular admin, admin dashboard angular,
dashboard template angular, admin panel angular, angular bootstrap dashboard, best angular admin template, dashboard using angular, admin panel in angular, dashboard template angular, admin panel angular, angular bootstrap dashboard, best angular admin template, dashboard using angular, admin panel in angular,
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
</head> </head>
<body> <body>
<!-- เทส jenkin -->
<app-root></app-root> <app-root></app-root>
</body> </body>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment