Skip to content

smart_core_connect / core-connect

Go to a project
Commit 8b1dcc6c by Prasong Putichanchai
Options

update sort Province , view big card

parent 97b57f7e
Showing with 63 additions and 105 deletions
www/src/Controller/ProfilesController.php
...@@ -38,7 +38,7 @@ class ProfilesController extends AppController ...@@ -38,7 +38,7 @@ class ProfilesController extends AppController
'valueField' => 'country_name_th' 'valueField' => 'country_name_th'
]); ]);
if(!empty($Country)) $Country = $Country->toArray(); if(!empty($Country)) $Country = $Country->toArray();
asort($Country);
//********DropdownProvince******** //********DropdownProvince********
$this->loadModel('MasterProvinces'); $this->loadModel('MasterProvinces');
$Province = $this->MasterProvinces->find('list', [ $Province = $this->MasterProvinces->find('list', [
...@@ -51,7 +51,7 @@ class ProfilesController extends AppController ...@@ -51,7 +51,7 @@ class ProfilesController extends AppController
->order(['province_name_th']); ->order(['province_name_th']);
// pr($Province);die; // pr($Province);die;
if(!empty($Province)) $Province = $Province->toArray(); if(!empty($Province)) $Province = $Province->toArray();
asort($Province);
$res = $responseUserPersonal['birthdate']; $res = $responseUserPersonal['birthdate'];
if($res){ if($res){
$dateNow = @$res->i18nFormat('dd/MM/yyyy'); $dateNow = @$res->i18nFormat('dd/MM/yyyy');
......
www/src/Controller/ProvincesController.php
...@@ -23,6 +23,7 @@ public function initialize() { ...@@ -23,6 +23,7 @@ public function initialize() {
))->toArray(); ))->toArray();
$arr = array(); $arr = array();
if(!empty($states)){ if(!empty($states)){
asort($states);
echo '<option value=""> ---Select--- </option>'; echo '<option value=""> ---Select--- </option>';
foreach($states as $key => $val){ foreach($states as $key => $val){
echo '<option value="' . $key . '">' . $val. '</option>'; echo '<option value="' . $key . '">' . $val. '</option>';
......
www/src/Controller/UsersController.php
...@@ -145,7 +145,7 @@ class UsersController extends AppController { ...@@ -145,7 +145,7 @@ class UsersController extends AppController {
] ]
); );
if(!empty($countries)) $countries = $countries->toArray(); if(!empty($countries)) $countries = $countries->toArray();
asort($countries);
$provinces = $this->MasterProvinces->find('list', $provinces = $this->MasterProvinces->find('list',
[ [
'conditions' => ['is_used' => true], 'conditions' => ['is_used' => true],
...@@ -154,6 +154,7 @@ class UsersController extends AppController { ...@@ -154,6 +154,7 @@ class UsersController extends AppController {
] ]
); );
if(!empty($provinces)) $provinces = $provinces->toArray(); if(!empty($provinces)) $provinces = $provinces->toArray();
asort($provinces);
$this->set(compact('provinces','countries')); $this->set(compact('provinces','countries'));
$this->viewBuilder()->layout('blank'); $this->viewBuilder()->layout('blank');
......
www/src/Template/Element/card_from/from_0.ctp
...@@ -82,25 +82,29 @@ use Cake\I18n\Time; ...@@ -82,25 +82,29 @@ use Cake\I18n\Time;
<!--/row modal card--> <!--/row modal card-->
<style> <style>
/* .form_1 {
.form_1 {
width: 100%; width: 100%;
height: 100%; height: 100%;
margin: auto; margin: auto;
padding: auto; padding: auto;
} }
.form_1-card-img { .form_1-card-img {
position: absolute; position: absolute;
width: 100%; width: 100%;
margin: auto; margin: auto;
padding: auto; padding: auto;
} }
.form_1-card-img img { .form_1-card-img img {
position: relative; position: relative;
width: 100%; width: 100%;
} }
/* iPads (landscape) ----------- */
@media screen and (min-width: 1024px) {
.rotate270 .row {
font-size: 28px !important;
}
.form_1 .date-name { .form_1 .date-name {
width: 500px; width: 500px;
margin: 55% 0% 0% -40%; margin: 55% 0% 0% -40%;
...@@ -109,55 +113,36 @@ use Cake\I18n\Time; ...@@ -109,55 +113,36 @@ use Cake\I18n\Time;
z-index: 9999; z-index: 9999;
display: block; display: block;
} }
.date-name div div { .date-name div div {
height: 35px; height: 35px;
} }
.form_1 .date-position { .form_1 .date-position {
width: 500px; width: 500px;
margin: 70% 0% 0% -15%; margin: 70% 0% 0% -15%;
position: absolute;
border-bottom: 0px solid #000; border-bottom: 0px solid #000;
display: block;
} }
.form_1 .date-time { .form_1 .date-time {
width: 500px; width: 500px;
margin: 70% 0% 0% 10%; margin: 70% 0% 0% 12%;
border-bottom: 0px solid #000; border-bottom: 0px solid #000;
} }
.form_1 .date-label { .form_1 .date-label {
width: 500px; width: 500px;
margin: 70% 0% 0% 20%; margin: 70% 0% 0% 20%;
border-bottom: 0px solid #000; border-bottom: 0px solid #000;
} */ }
}
/* Add your styles for devices with a maximum width of 320 */ /* Add your styles for devices with a maximum width of 768 */
@media screen and (max-width: 320px) { @media screen and (max-width: 768px){
.rotate270 .row { .rotate270 .row {
font-size: 20px !important; font-size: 25px !important;
}
.form_1 {
width: 100%;
height: 100%;
margin: auto;
padding: auto;
}
.form_1-card-img {
position: absolute;
width: 100%;
margin: auto;
padding: auto;
}
.form_1-card-img img {
position: relative;
width: 100%;
} }
.form_1 .date-name { .form_1 .date-name {
width: 400px; width: 500px;
margin: 50% 0% 0% -40%; margin: 55% 0% 0% -40%;
border-bottom: 0px solid red; border-bottom: 0px solid red;
position: absolute; position: absolute;
z-index: 9999; z-index: 9999;
...@@ -167,49 +152,34 @@ use Cake\I18n\Time; ...@@ -167,49 +152,34 @@ use Cake\I18n\Time;
height: 35px; height: 35px;
} }
.form_1 .date-position { .form_1 .date-position {
width: 400px; width: 500px;
margin: 68% 0% 0% -12%; margin: 70% 0% 0% -15%;
position: absolute;
border-bottom: 0px solid #000; border-bottom: 0px solid #000;
display: block;
} }
.form_1 .date-time { .form_1 .date-time {
width: 400px; width: 500px;
margin: 70% 0% 0% 5%; margin: 70% 0% 0% 12%;
border-bottom: 0px solid #000; border-bottom: 0px solid #000;
} }
.form_1 .date-label { .form_1 .date-label {
width: 400px; width: 500px;
margin: 70% 0% 0% 15%; margin: 70% 0% 0% 20%;
border-bottom: 0px solid #000; border-bottom: 0px solid #000;
} }
}
}
/* Add your styles for devices with a maximum width of 480 */ /* Add your styles for devices with a maximum width of 480 */
@media screen and (min-width: 480px) and (max-width: 320px){ @media screen and (max-width: 480px){
.rotate270 .row { .rotate270 .row {
font-size: 22px !important; font-size: 22px !important;
} }
.form_1 {
color:red;
width: 100%;
height: 100%;
margin: auto;
padding: auto;
}
.form_1-card-img {
position: absolute;
width: 100%;
margin: auto;
padding: auto;
}
.form_1-card-img img {
position: relative;
width: 100%;
}
.form_1 .date-name { .form_1 .date-name {
width: 400px; width: 450px;
margin: 50% 0% 0% -40%; margin: 55% 0% 0% -45%;
border-bottom: 0px solid red; border-bottom: 0px solid red;
position: absolute; position: absolute;
z-index: 9999; z-index: 9999;
...@@ -219,78 +189,59 @@ use Cake\I18n\Time; ...@@ -219,78 +189,59 @@ use Cake\I18n\Time;
height: 35px; height: 35px;
} }
.form_1 .date-position { .form_1 .date-position {
width: 400px; width: 450px;
margin: 68% 0% 0% -12%; margin: 70% 0% 0% -18%;
position: absolute;
border-bottom: 0px solid #000; border-bottom: 0px solid #000;
display: block;
} }
.form_1 .date-time { .form_1 .date-time {
width: 400px; width: 450px;
margin: 70% 0% 0% 5%; margin: 70% 0% 0% 5%;
border-bottom: 0px solid #000; border-bottom: 0px solid #000;
} }
.form_1 .date-label { .form_1 .date-label {
width: 400px; width: 450px;
margin: 70% 0% 0% 15%; margin: 70% 0% 0% 15%;
border-bottom: 0px solid #000; border-bottom: 0px solid #000;
} }
} }
/* Add your styles for devices with a maximum width of 768 */ /* Add your styles for devices with a maximum width of 320 */
@media screen and (min-width: 768px) and (max-width: 480px) { } @media screen and (max-width: 320px) {
/* iPads (landscape) ----------- */ .rotate270 .row {
@media only screen and (min-width: 768px) and (max-width: 480px) and (orientation : landscape) {} font-size: 20px !important;
/* iPads (portrait) ----------- */
@media only screen and (min-width: 768px) and (max-width: 480px) and (orientation : portrait) {}
@media (min-width: 768px) {
/* .form_1 {
width: 100%;
height: 100%;
margin: auto;
padding: auto;
}
.form_1-card-img {
position: absolute;
width: 100%;
margin: auto;
padding: auto;
}
.form_1-card-img img {
position: relative;
width: 100%;
} }
.form_1 .date-name { .form_1 .date-name {
width: 500px; width: 400px;
margin: 55% 0% 0% -40%; margin: 50% 0% 0% -40%;
border-bottom: 0px solid red; border-bottom: 0px solid red;
position: absolute; position: absolute;
z-index: 9999; z-index: 9999;
display: block; display: block;
} }
.date-name div div { .date-name div div {
height: 35px; height: 35px;
} }
.form_1 .date-position { .form_1 .date-position {
width: 500px; width: 400px;
margin: 70% 0% 0% -15%; margin: 68% 0% 0% -12%;
border-bottom: 0px solid #000; border-bottom: 0px solid #000;
} }
.form_1 .date-time { .form_1 .date-time {
width: 500px; width: 400px;
margin: 70% 0% 0% 10%; margin: 70% 0% 0% 5%;
border-bottom: 0px solid #000; border-bottom: 0px solid #000;
} }
.form_1 .date-label { .form_1 .date-label {
width: 500px; width: 400px;
margin: 70% 0% 0% 20%; margin: 70% 0% 0% 15%;
border-bottom: 0px solid #000; border-bottom: 0px solid #000;
} */
} }
}
</style> </style>
\ No newline at end of file
www/src/Template/Element/card_from/from_add_card.ctp
...@@ -64,7 +64,6 @@ ...@@ -64,7 +64,6 @@
$(document).ready(function () { $(document).ready(function () {
$("#organize_code").on('change', function () { $("#organize_code").on('change', function () {
console.log('sss');
var organize_code = $("#organize_code").val(); var organize_code = $("#organize_code").val();
$('#employee').attr("disabled", true); $('#employee').attr("disabled", true);
$('#date').attr("disabled", true); $('#date').attr("disabled", true);
......
www/src/Template/Profiles/index.ctp
...@@ -581,6 +581,11 @@ use Cake\I18n\Time; ...@@ -581,6 +581,11 @@ use Cake\I18n\Time;
display:block; display:block;
z-index:3999; z-index:3999;
} }
@media screen and (min-width: 1024px) {
.box-ads .close-modal {
margin-right: 100px;
}
}
</style> </style>
......
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 sign in to comment