Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
smart_core_connect
/
core-connect
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
8b1dcc6c
authored
Jun 04, 2018
by
Prasong Putichanchai
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update sort Province , view big card
parent
97b57f7e
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
63 additions
and
105 deletions
+63
-105
www/src/Controller/ProfilesController.php
+2
-2
www/src/Controller/ProvincesController.php
+1
-0
www/src/Controller/UsersController.php
+2
-1
www/src/Template/Element/card_from/from_0.ctp
+53
-101
www/src/Template/Element/card_from/from_add_card.ctp
+0
-1
www/src/Template/Profiles/index.ctp
+5
-0
No files found.
www/src/Controller/ProfilesController.php
View file @
8b1dcc6c
...
...
@@ -38,7 +38,7 @@ class ProfilesController extends AppController
'valueField'
=>
'country_name_th'
]);
if
(
!
empty
(
$Country
))
$Country
=
$Country
->
toArray
();
asort
(
$Country
);
//********DropdownProvince********
$this
->
loadModel
(
'MasterProvinces'
);
$Province
=
$this
->
MasterProvinces
->
find
(
'list'
,
[
...
...
@@ -51,7 +51,7 @@ class ProfilesController extends AppController
->
order
([
'province_name_th'
]);
// pr($Province);die;
if
(
!
empty
(
$Province
))
$Province
=
$Province
->
toArray
();
asort
(
$Province
);
$res
=
$responseUserPersonal
[
'birthdate'
];
if
(
$res
){
$dateNow
=
@
$res
->
i18nFormat
(
'dd/MM/yyyy'
);
...
...
www/src/Controller/ProvincesController.php
View file @
8b1dcc6c
...
...
@@ -23,6 +23,7 @@ public function initialize() {
))
->
toArray
();
$arr
=
array
();
if
(
!
empty
(
$states
)){
asort
(
$states
);
echo
'<option value=""> ---Select--- </option>'
;
foreach
(
$states
as
$key
=>
$val
){
echo
'<option value="'
.
$key
.
'">'
.
$val
.
'</option>'
;
...
...
www/src/Controller/UsersController.php
View file @
8b1dcc6c
...
...
@@ -145,7 +145,7 @@ class UsersController extends AppController {
]
);
if
(
!
empty
(
$countries
))
$countries
=
$countries
->
toArray
();
asort
(
$countries
);
$provinces
=
$this
->
MasterProvinces
->
find
(
'list'
,
[
'conditions'
=>
[
'is_used'
=>
true
],
...
...
@@ -154,6 +154,7 @@ class UsersController extends AppController {
]
);
if
(
!
empty
(
$provinces
))
$provinces
=
$provinces
->
toArray
();
asort
(
$provinces
);
$this
->
set
(
compact
(
'provinces'
,
'countries'
));
$this
->
viewBuilder
()
->
layout
(
'blank'
);
...
...
www/src/Template/Element/card_from/from_0.ctp
View file @
8b1dcc6c
...
...
@@ -82,25 +82,29 @@ use Cake\I18n\Time;
<!--/row modal card-->
<style>
/* .form_1 {
.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%;
}
/* iPads (landscape) ----------- */
@media screen and (min-width: 1024px) {
.rotate270 .row {
font-size: 28px !important;
}
.form_1 .date-name {
width: 500px;
margin: 55% 0% 0% -40%;
...
...
@@ -109,55 +113,36 @@ use Cake\I18n\Time;
z-index: 9999;
display: block;
}
.date-name div div {
height: 35px;
}
.form_1 .date-position {
width: 500px;
margin: 70% 0% 0% -15%;
position: absolute;
border-bottom: 0px solid #000;
display: block;
}
.form_1 .date-time {
width: 500px;
margin: 70% 0% 0% 10
%;
margin: 70% 0% 0% 12
%;
border-bottom: 0px solid #000;
}
.form_1 .date-label {
width: 500px;
margin: 70% 0% 0% 20%;
border-bottom: 0px solid #000;
} */
}
}
/* Add your styles for devices with a maximum width of 320
*/
@media screen and (max-width:
320px)
{
/* Add your styles for devices with a maximum width of 768
*/
@media screen and (max-width:
768px)
{
.rotate270 .row {
font-size: 20px !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%;
font-size: 25px !important;
}
.form_1 .date-name {
width:
4
00px;
margin: 5
0
% 0% 0% -40%;
width:
5
00px;
margin: 5
5
% 0% 0% -40%;
border-bottom: 0px solid red;
position: absolute;
z-index: 9999;
...
...
@@ -167,49 +152,34 @@ use Cake\I18n\Time;
height: 35px;
}
.form_1 .date-position {
width: 400px;
margin: 68% 0% 0% -12%;
width: 500px;
margin: 70% 0% 0% -15%;
position: absolute;
border-bottom: 0px solid #000;
display: block;
}
.form_1 .date-time {
width:
4
00px;
margin: 70% 0% 0%
5
%;
width:
5
00px;
margin: 70% 0% 0%
12
%;
border-bottom: 0px solid #000;
}
.form_1 .date-label {
width:
4
00px;
margin: 70% 0% 0%
15
%;
width:
5
00px;
margin: 70% 0% 0%
20
%;
border-bottom: 0px solid #000;
}
}
}
/* Add your styles for devices with a maximum width of 480 */
@media screen and (m
in-width: 480px) and (max-width: 32
0px){
@media screen and (m
ax-width: 48
0px){
.rotate270 .row {
.rotate270 .row {
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 {
width: 4
0
0px;
margin: 5
0% 0% 0% -40
%;
width: 4
5
0px;
margin: 5
5% 0% 0% -45
%;
border-bottom: 0px solid red;
position: absolute;
z-index: 9999;
...
...
@@ -219,78 +189,59 @@ use Cake\I18n\Time;
height: 35px;
}
.form_1 .date-position {
width: 400px;
margin: 68% 0% 0% -12%;
width: 450px;
margin: 70% 0% 0% -18%;
position: absolute;
border-bottom: 0px solid #000;
display: block;
}
.form_1 .date-time {
width: 4
0
0px;
width: 4
5
0px;
margin: 70% 0% 0% 5%;
border-bottom: 0px solid #000;
}
.form_1 .date-label {
width: 4
0
0px;
width: 4
5
0px;
margin: 70% 0% 0% 15%;
border-bottom: 0px solid #000;
}
}
/* Add your styles for devices with a maximum width of 768 */
@media screen and (min-width: 768px) and (max-width: 480px) { }
/* iPads (landscape) ----------- */
@media only screen and (min-width: 768px) and (max-width: 480px) and (orientation : landscape) {}
/* 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%;
/* Add your styles for devices with a maximum width of 320 */
@media screen and (max-width: 320px) {
.rotate270 .row {
font-size: 20px !important;
}
.form_1 .date-name {
width: 5
00px;
margin: 55
% 0% 0% -40%;
width: 4
00px;
margin: 50
% 0% 0% -40%;
border-bottom: 0px solid red;
position: absolute;
z-index: 9999;
display: block;
}
.date-name div div {
height: 35px;
}
.form_1 .date-position {
width: 5
00px;
margin: 70% 0% 0% -15
%;
width: 4
00px;
margin: 68% 0% 0% -12
%;
border-bottom: 0px solid #000;
}
.form_1 .date-time {
width: 5
00px;
margin: 70% 0% 0% 10
%;
width: 4
00px;
margin: 70% 0% 0% 5
%;
border-bottom: 0px solid #000;
}
.form_1 .date-label {
width: 5
00px;
margin: 70% 0% 0% 20
%;
width: 4
00px;
margin: 70% 0% 0% 15
%;
border-bottom: 0px solid #000;
} */
}
}
</style>
\ No newline at end of file
www/src/Template/Element/card_from/from_add_card.ctp
View file @
8b1dcc6c
...
...
@@ -64,7 +64,6 @@
$(document).ready(function () {
$("#organize_code").on('change', function () {
console.log('sss');
var organize_code = $("#organize_code").val();
$('#employee').attr("disabled", true);
$('#date').attr("disabled", true);
...
...
www/src/Template/Profiles/index.ctp
View file @
8b1dcc6c
...
...
@@ -581,6 +581,11 @@ use Cake\I18n\Time;
display:block;
z-index:3999;
}
@media screen and (min-width: 1024px) {
.box-ads .close-modal {
margin-right: 100px;
}
}
</style>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment