Skip to content

smart_core_connect / core-connect

Go to a project
Commit 671cae96 by Prasong Putichanchai
Options

Merge branch 'integration' into prasong 

# Conflicts:
#	www/src/Controller/ProfilesController.php
parents 48da6edc 9a744ad6
Showing with 104 additions and 22 deletions
www/composer.json
...@@ -11,8 +11,10 @@ ...@@ -11,8 +11,10 @@
"cakephp/migrations": "^1.0", "cakephp/migrations": "^1.0",
"cakephp/plugin-installer": "^1.0", "cakephp/plugin-installer": "^1.0",
"josegonzalez/dotenv": "2.*", "josegonzalez/dotenv": "2.*",
"league/oauth2-github": "^2.0",
"maiconpinto/cakephp-adminlte-theme": "^1.0", "maiconpinto/cakephp-adminlte-theme": "^1.0",
"mobiledetect/mobiledetectlib": "2.*" "mobiledetect/mobiledetectlib": "2.*",
"muffin/oauth2": "dev-master"
}, },
"require-dev": { "require-dev": {
"cakephp/bake": "^1.1", "cakephp/bake": "^1.1",
......
www/src/Controller/ProfilesController.php
...@@ -103,13 +103,13 @@ class ProfilesController extends AppController ...@@ -103,13 +103,13 @@ class ProfilesController extends AppController
$userPersonals['master_province_id'] = $this->request->data['master_province_id']; $userPersonals['master_province_id'] = $this->request->data['master_province_id'];
$userPersonals['modified_by'] = $id; $userPersonals['modified_by'] = $id;
if ($this->UserPersonals->save($userPersonals)) { if ($this->UserPersonals->save($userPersonals)) {
$this->Flash->success(__('Update Complete.')); $this->Flash->success(__('Update Complete.'));
return $this->redirect(['action' => 'index']); return $this->redirect(['action' => 'index']);
}
}else{
$this->Flash->error(__('Email Address already used by others.'));
} }
}else{
$this->Flash->error(__('Email Address already used by others.'));
}
$this->Flash->error(__('Not update. Please, try again.')); $this->Flash->error(__('Not update. Please, try again.'));
} }
$this->set(compact('userPersonals', 'responseUserProfile', 'dateNow', 'username', 'Country', 'Province', 'responseUserPersonal')); $this->set(compact('userPersonals', 'responseUserProfile', 'dateNow', 'username', 'Country', 'Province', 'responseUserPersonal'));
......
www/src/Template/UserCards/view_card.ctp
...@@ -176,21 +176,74 @@ use Cake\I18n\Time; ...@@ -176,21 +176,74 @@ use Cake\I18n\Time;
<div class="col-xs-12 col-sm-12 col-md-12"> <div class="col-xs-12 col-sm-12 col-md-12">
<div class="modal fade" id="defaultModal" tabindex="-1" role="dialog" aria-labelledby="defaultModalLabel" aria-hidden="true"> <div class="modal fade" id="defaultModal" tabindex="-1" role="dialog" aria-labelledby="defaultModalLabel" aria-hidden="true">
<div class="modal-dialog"> <div class="modal-dialog">
<div class=""> <div class="col-md-6">
<div class=""> <div class = "">
<div class="col-md-6"> <div class="owl-carousel owl-theme" data-plugin-options="{'items': 1, 'margin': 10}">
<div class="owl-carousel owl-theme" data-plugin-options="{'items': 1, 'margin': 10}"> <div class = "row rotate270 form_1">
<div> <?php echo $this->Html->image('/img/core/img/card-bg-front@3x.png', array('div' => false, 'class' => 'img-responsive img-rounded','style' => 'position: absolute;')); ?>
<?php echo $this->Html->image('/img/core/img/card-bg-front@3x.png', array('div' => false, 'class' => 'img-responsive img-rounded','style' => 'position: absolute;')); ?> <div class="row date-name">
<div class="idcard-profile"><?php echo __('ID Card');?></div> <div class="col-xs-1">
</div> </div>
<div> <div class="col-xs-6">
<?php echo $this->Html->image('/img/core/img/card-bg-back@3x.png', array('div' => false, 'class' => 'img-responsive img-rounded','style' => '3position: absolute;')); ?> <div style="font-size: 17px">
</div> <br>
</div> <label>id<label>
</div> </div>
</div> <div>
</div> <?php echo $value['card_code'] ?>
</div>
<div>
<label style="font-size: 17px">ชื่อ</label> <?php echo $value['prefix_name_th'].$value['firstname_th'].' '.$value['lastname_th'] ?>
</div>
</div>
<div class="col-xs-4">
<div data-toggle="modal" data-target="#defaultModal" style="text-align: center; cursor: pointer;">
<img src="/img/core/img/user-profile@3x.png" class="img-responsive">
</div>
</div>
</div>
<div class="row date-position">
<div class="col-xs-1">
</div>
<div class="col-xs-10">
<label style="font-size: 17px">ตำแหน่ง</label> <?php echo $value['position_name'] ?>
</div>
</div>
<div class="row date-time">
<div class="col-xs-1">
</div>
<div class="col-xs-5">
<?php
$now = new Time($value['date_issued']);
$dateIssued = $now->i18nFormat('yyyy-MM-dd');
echo $this->DateFormat->formatDateThai($dateIssued);
?>
</div>
<div class="col-xs-5">
<?php
$now = new Time($value['date_expiry']);
$dateExpiry = $now->i18nFormat('yyyy-MM-dd');
echo $this->DateFormat->formatDateThai($dateExpiry);
?>
</div>
</div>
<div class="row date-label">
<div class="col-xs-1">
</div>
<div class="col-xs-5">
<label style="font-size: 17px">วันออกบัตร</label>
</div>
<div class="col-xs-5">
<label style="font-size: 17px">วันหมดออายุ</label>
</div>
</div>
<div>
<?php echo $this->Html->image('/img/core/img/card-bg-back@3x.png', array('div' => false, 'class' => 'img-responsive img-rounded','style' => '3position: absolute;')); ?>
</div>
</div>
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -212,6 +265,33 @@ use Cake\I18n\Time; ...@@ -212,6 +265,33 @@ use Cake\I18n\Time;
cursor: pointer; cursor: pointer;
} }
.rotate270 .row{
-webkit-transform: rotate(270deg);
-moz-transform: rotate(270deg);
-o-transform: rotate(270deg);
writing-mode: rl-tb;
position: absolute;
}
.form_1 .date-name{
width: 150px;
margin: 100% 0% 0% 62%;
}
.form_1 .date-position{
width: 150px;
margin: 100% 0% 0% 62%;
}
.form_1 .date-time{
width: 150px;
margin: 100% 0% 0% 62%;
}
.form_1 .date-label{
width: 150px;
margin: 100% 0% 0% 62%;
}
</style> </style>
<?php $this->append('scriptBottom'); ?> <?php $this->append('scriptBottom'); ?>
<script type="text/javascript"> <script type="text/javascript">
......
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