Skip to content

smart_core_connect / core-connect

Go to a project
Commit c9ff32ad by Teeradone-PIM
Options

Merge branch 'integration' into teeradone

parents a95dafc9 9dba9ad1
Showing with 196 additions and 36 deletions
www/src/Controller/ProfilesController.php
...@@ -105,13 +105,13 @@ class ProfilesController extends AppController ...@@ -105,13 +105,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/Controller/UserCardsController.php
...@@ -231,7 +231,7 @@ class UserCardsController extends AppController ...@@ -231,7 +231,7 @@ class UserCardsController extends AppController
} }
public function viewCard($user_id = null){ public function viewCard($user_id = null){
$this->viewBuilder()->layout('blank'); $this->viewBuilder()->layout('blank');
// $user = $this->Auth(); $user_id = $this->Auth->user('id');
$this->loadModel('UserCards'); $this->loadModel('UserCards');
$UserCards = $this->UserCards->find('all') $UserCards = $this->UserCards->find('all')
->select($this->UserCards) ->select($this->UserCards)
...@@ -301,8 +301,8 @@ class UserCardsController extends AppController ...@@ -301,8 +301,8 @@ class UserCardsController extends AppController
$userCard['date_expiry'] = $TempUserCards['date_expiry']; $userCard['date_expiry'] = $TempUserCards['date_expiry'];
$userCard['signature'] = $TempUserCards['signature']; $userCard['signature'] = $TempUserCards['signature'];
$userCard['is_used'] = $TempUserCards['is_used']; $userCard['is_used'] = $TempUserCards['is_used'];
$userCard['created_by'] = 1; $userCard['created_by'] = $this->Auth->user('id');
$userCard['user_id'] = 1; $userCard['user_id'] = $this->Auth->user('id');
// pr($userCard);die; // pr($userCard);die;
if ($this->UserCards->save($userCard)) { if ($this->UserCards->save($userCard)) {
$TempUserCards['is_used'] = 0; $TempUserCards['is_used'] = 0;
......
www/src/Template/UserCards/view_card.ctp
...@@ -153,13 +153,13 @@ use Cake\I18n\Time; ...@@ -153,13 +153,13 @@ use Cake\I18n\Time;
</div> </div>
<div class="form-group has-feedback"> <div class="form-group has-feedback">
<div class="col-xs-12 col-sm-12 col-md-12"> <div class="col-xs-12 col-sm-12 col-md-12">
<?php echo $this->Form->input('UserCards.employee', ['class' => 'form-control-reg border-bottom-from label-text-sub required', 'id' => 'employee', 'type' => 'text', 'label' => __('Ref 1'), 'placeholder' => 'รหัสพนักงาน / รหัสนักศึกษา', 'disabled', 'required']); ?> <?php echo $this->Form->input('UserCards.employee', ['class' => 'form-control-reg border-bottom-from label-text-sub required', 'id' => 'employee', 'type' => 'text', 'label' => __('Ref 1'), 'placeholder' => 'Ref 1', 'disabled']); ?>
</div> </div>
</div> </div>
<div class="form-group has-feedback bootstrap-iso"> <div class="form-group has-feedback bootstrap-iso">
<div class="col-xs-12 col-sm-12 col-md-12"> <div class="col-xs-12 col-sm-12 col-md-12">
<label class="label-text-sub"><?php echo __('Ref 2');?></label> <label class="label-text-sub"><?php echo __('Ref 2');?></label>
<input type="text" name="UserCards[birthdate]" id="date" placeholder="กรุณาระบุวันเดือนปีเกิด" value="" placeholder="DD-MM-YYYY" data-date-format="mm/dd/yyyy" class="form-control-reg border-bottom-from" disabled> <input type="text" name="UserCards[birthdate]" id="date" placeholder="Ref 2" value="" placeholder="DD-MM-YYYY" data-date-format="mm/dd/yyyy" class="form-control-reg border-bottom-from" disabled>
<span class="glyphicon glyphicon-calendar form-control-feedback"></span> <span class="glyphicon glyphicon-calendar form-control-feedback"></span>
</div> </div>
</div> </div>
...@@ -250,6 +250,113 @@ use Cake\I18n\Time; ...@@ -250,6 +250,113 @@ use Cake\I18n\Time;
</div> </div>
<style> <style>
#alertBox {
position:relative;
width:300px;
min-height:100px;
/*margin-top:50px;*/
border:1px solid #666;
background-color:#fff;
background-repeat:no-repeat;
background-position:20px 30px;
left: 0;
right: 0;
top: 100px;
z-index: 2;
}
#modalContainer > #alertBox {
position:fixed;
}
#alertBox h1 {
margin:0;
font:bold 0.9em verdana,arial;
background-color:#000;
color:#FFF;
border-bottom:1px solid #000;
padding:2px 0 2px 5px;
}
#alertBox p {
font-size: 14px;
height: 30px;
padding: 10px;
/* margin-left: 55px; */
text-align: center;
}
#alertBox #closeBtn {
display:block;
position:relative;
margin:5px auto;
padding:7px;
border:0 none;
width:70px;
font:0.7em verdana,arial;
text-transform:uppercase;
text-align:center;
color:#FFF;
background-color:#000;
border-radius: 3px;
text-decoration:none;
}
/* unrelated styles */
#mContainer {
position:relative;
width:600px;
margin:auto;
padding:5px;
border-top:2px solid #000;
border-bottom:2px solid #000;
font:0.7em verdana,arial;
}
h1,h2 {
margin:0;
padding:4px;
font:bold 1.5em verdana;
border-bottom:1px solid #000;
text-align: center;
}
code {
font-size:1.2em;
color:#069;
}
#credits {
position:relative;
margin:25px auto 0px auto;
width:350px;
font:0.7em verdana;
border-top:1px solid #000;
border-bottom:1px solid #000;
height:90px;
padding-top:4px;
}
#credits img {
float:left;
margin:5px 10px 5px 0px;
border:1px solid #000000;
width:80px;
height:79px;
}
.important {
background-color:#F5FCC8;
padding:2px;
}
code span {
color:green;
}
</style>
<style>
.box-card{ .box-card{
border: 1px solid #ccc; border: 1px solid #ccc;
height: 200px; height: 200px;
...@@ -293,34 +400,84 @@ use Cake\I18n\Time; ...@@ -293,34 +400,84 @@ use Cake\I18n\Time;
margin: 100% 0% 0% 62%; margin: 100% 0% 0% 62%;
} }
</style> </style>
<?php $this->append('scriptBottom'); ?> <?php $this->append('scriptBottom'); ?>
<script type="text/javascript"> <script>
var ALERT_TITLE = "";
var ALERT_BUTTON_TEXT = "Ok";
$('.owl-carousel').owlCarousel({ if (document.getElementById) {
loop:false, window.alert = function (txt) {
items:1, createCustomAlert(txt);
rewindNav : false, }
onTranslated:callBack }
}); function createCustomAlert(txt) {
owl = $('.owl-carousel').owlCarousel(); d = document;
$(".prev").click(function () { if (d.getElementById("modalContainer"))
owl.trigger('prev.owl.carousel'); return;
}); mObj = d.getElementsByTagName("body")[0].appendChild(d.createElement("div"));
mObj.id = "modalContainer";
mObj.style.height = d.documentElement.scrollHeight + "px";
alertObj = mObj.appendChild(d.createElement("div"));
alertObj.id = "alertBox";
if (d.all && !window.opera)
alertObj.style.top = document.documentElement.scrollTop + "px";
alertObj.style.left = (d.documentElement.scrollWidth - alertObj.offsetWidth) / 2 + "px";
alertObj.style.visiblity = "visible";
$(".next").click(function () { h1 = alertObj.appendChild(d.createElement("h1"));
owl.trigger('next.owl.carousel'); h1.appendChild(d.createTextNode(ALERT_TITLE));
});
function callBack(){ msg = alertObj.appendChild(d.createElement("p"));
if($('.owl-carousel .owl-item').last().hasClass('active')){ //msg.appendChild(d.createTextNode(txt));
$('.next').hide(); msg.innerHTML = txt;
$('.prev').show();
btn = alertObj.appendChild(d.createElement("a"));
}else if($('.owl-carousel .owl-item').first().hasClass('active')){ btn.id = "closeBtn";
$('.prev').hide(); btn.appendChild(d.createTextNode(ALERT_BUTTON_TEXT));
$('.next').show(); btn.href = "#";
btn.focus();
btn.onclick = function () {
removeCustomAlert();
return false;
}
alertObj.style.display = "block";
} }
}
function removeCustomAlert() {
document.getElementsByTagName("body")[0].removeChild(document.getElementById("modalContainer"));
}
function ful() {
alert('Alert this pages');
}
</script>
<script type="text/javascript">
$('.owl-carousel').owlCarousel({
loop:false,
items:1,
rewindNav : false,
onTranslated:callBack
});
owl = $('.owl-carousel').owlCarousel();
$(".prev").click(function () {
owl.trigger('prev.owl.carousel');
});
$(".next").click(function () {
owl.trigger('next.owl.carousel');
});
function callBack(){
if($('.owl-carousel .owl-item').last().hasClass('active')){
$('.next').hide();
$('.prev').show();
}else if($('.owl-carousel .owl-item').first().hasClass('active')){
$('.prev').hide();
$('.next').show();
}
}
var organize_id = $("#organize_id"); var organize_id = $("#organize_id");
var employee = $("#employee"); var employee = $("#employee");
...@@ -361,12 +518,14 @@ function callBack(){ ...@@ -361,12 +518,14 @@ function callBack(){
}); });
function check() { function check() {
if (employee.val() == '') { if (employee.val() == '') {
alert('กรุณากรอก Ref1');
employee.focus(); employee.focus();
return false; return false;
} }
if (date.val() == '') { if (date.val() == '') {
return false; alert('กรุณากรอก Ref2');
date.focus(); date.focus();
return false;
} }
} }
$(document).ready(function(){ $(document).ready(function(){
...@@ -381,4 +540,4 @@ function callBack(){ ...@@ -381,4 +540,4 @@ function callBack(){
date_input.datepicker(options); date_input.datepicker(options);
}) })
</script> </script>
<?php $this->end();?> <?php $this->end();?>
\ No newline at end of file
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