Commit 0ae6c106 by Zen-PC\Zen

Merge branch 'integration' into kraikrit

parents f51bf3de dd0993fb
......@@ -123,7 +123,7 @@ class UserCardsController extends AppController
$this->loadModel('MasterOrganizations');
if ($this->request->is('post')) {
// pr($this->Auth);die;
// pr($this->request->data());die;
// pr($this->request->data());
$birthdate = explode("/", $this->request->data['UserCards']['birthdate']);
$birthdate = $birthdate['2'].'-'.$birthdate['1'].'-'.$birthdate['0'];
$TempUserCards = $this->TempUserCards->find('all', [
......@@ -132,49 +132,101 @@ class UserCardsController extends AppController
'card_code' => $this->request->data['UserCards']['employee'],
'birthdate' => $birthdate
]
])->toArray();
$TempUserCards = $this->TempUserCards->get($TempUserCards[0]['id']);
// pr($TempUserCards);die;
// pr($this->TempUserCards->get($TempUserCards[0]['id']));die;
$userCard = $this->UserCards->newEntity();
//pr($userCard);die;
// $userCard = $this->UserCards->patchEntity($userCard, $TempUserCards);
$userCard = $TempUserCards;
$userCard['user_id'] = 1;
$userCard['id'] = null;
// pr($userCard->toArray());die;
if ($this->UserCards->save($userCard)) {
$this->Flash->success(__('The user card has been saved.'));
die;
return $this->redirect(['action' => 'index']);
])->first();
if(!empty($TempUserCards)){
$UserCards = $this->UserCards->find('all', [
'conditions' => [
'organize_id' => $TempUserCards['organize_id'],
'card_code' => $TempUserCards['card_code']
]
])->first();
// pr($UserCards);die;
if(empty($UserCards)){
$userCard = $this->UserCards->newEntity();
$userCard['organize_id'] = $TempUserCards['organize_id'];
$userCard['card_code'] = $TempUserCards['card_code'];
$userCard['img_path'] = $TempUserCards['img_path'];
$userCard['prefix_name_th'] = $TempUserCards['prefix_name_th'];
$userCard['firstname_th'] = $TempUserCards['firstname_th'];
$userCard['lastname_th'] = $TempUserCards['lastname_th'];
$userCard['prefix_name_en'] = $TempUserCards['prefix_name_en'];
$userCard['firstname_en'] = $TempUserCards['firstname_en'];
$userCard['lastname_en'] = $TempUserCards['lastname_en'];
$userCard['department_name'] = $TempUserCards['department_name'];
$userCard['section_name'] = $TempUserCards['section_name'];
$userCard['position_name'] = $TempUserCards['position_name'];
$userCard['gender'] = $TempUserCards['gender'];
$userCard['blood_group'] = $TempUserCards['blood_group'];
$userCard['birthdate'] = $TempUserCards['birthdate'];
$userCard['date_issued'] = $TempUserCards['date_issued'];
$userCard['date_expiry'] = $TempUserCards['date_expiry'];
$userCard['signature'] = $TempUserCards['signature'];
$userCard['is_used'] = $TempUserCards['is_used'];
$userCard['created_by'] = 1;
$userCard['user_id'] = 1;
// pr($userCard);die;
if ($this->UserCards->save($userCard)) {
$this->Flash->success(__('บันทึกสำเร็จ'));
return $this->redirect(['controller' => 'Profiles', 'action' => 'index']);
}
}else{
$this->Flash->success(__('ลงทะเบียนไว้อยู่แล้ว'));
return $this->redirect(['controller' => 'UserCards', 'action' => 'createCards']);
}
}else{
$this->Flash->success(__('ไม่พบข้อมูล'));
return $this->redirect(['controller' => 'UserCards', 'action' => 'createCards']);
}
$this->Flash->error(__('The user card could not be saved. Please, try again.'));
// pr($TempUserCards);die;
}
}
public function checkOrg()
{
$this->autoRender = false;
// $this->loadModel('MasterOrganizations');
// $MasterOrganizations = $this->MasterOrganizations->find('all', [
// 'fields' => [
// 'id',
// 'org_code',
// 'org_name_th'
// ], 'conditions' => [
// 'org_code' => 'PAGO0010'
// ]
// ])->toArray();
// pr($MasterOrganizations);die;
if ($this->request->is('post')) {
$this->loadModel('MasterOrganizations');
$MasterOrganizations = $this->MasterOrganizations->find('all', [
'fields' => [
'id','org_code',
'id',
'org_code',
'org_name_th'
], 'conditions' => [
'org_code' => $this->request->data['organize_code']
]
])->toArray();
if(!empty($MasterOrganizations)){
$data = json_encode($MasterOrganizations);
echo $data;
$UserCards = $this->UserCards->find('all', [
'fields' => [
'id',
'user_id',
'organize_id'
], 'conditions' => [
'user_id' => 2,
'organize_id' => $MasterOrganizations[0]['id']
]
])->toArray();
if(empty($UserCards)){
$MasterOrganizations['chkuser'] = false;
$data = json_encode($MasterOrganizations);
echo $data;
}else{
$MasterOrganizations['chkuser'] = true;
$data = json_encode($MasterOrganizations);
echo $data;
}
}else{
echo 'false';
}
}
}
}
}
\ No newline at end of file
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12">
<?php echo $this->Form->create('UserCrads', ['id' => 'frmSignIn', 'type' => 'file', 'onsubmit' => 'return check();']); ?>
<?php echo $this->Form->create('UserCards', ['id' => 'frmSignIn', 'type' => 'file', 'onsubmit' => 'return check();']); ?>
<div style="position: absolute;z-index: 2;">
<a href="profile_setting"><img src="/img/core/img/setting-icon@3x.png"/></a>
</div>
......@@ -25,14 +25,13 @@
</div>
<div class="form-group has-feedback bootstrap-iso">
<div class="col-xs-12 col-sm-12 col-md-12">
<!-- <?php echo $this->Form->input('UserCards.birthdate', ['class' => 'form-control-reg border-bottom-from label-text-sub required', 'id' => 'birthdate', 'type' => 'daet', 'label' => __('วันเกิด'), 'placeholder' => '01/01/2000', 'disabled', 'required']); ?> -->
<label class="label-text-sub"><?php echo __('วันเกิด');?></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">
<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>
<span class="glyphicon glyphicon-calendar form-control-feedback"></span>
</div>
</div>
<div>
<button type="submit" class="btn btn-quaternary mr-xs mb-sm button-text-profile">บันทึก</button>
<button type="submit" class="btn btn-quaternary mr-xs mb-sm button-text-profile">ตรวจสอบ</button>
</div>
<?php echo $this->Form->end(); ?>
</div>
......@@ -49,11 +48,21 @@
if(data!='false'){
data = jQuery.parseJSON(data);
console.log(data);
$("#nameorg_th").text(data[0]['org_name_th']);
$("#noorg_th").text('');
$("#employee").removeAttr("disabled");
$("#date").removeAttr("disabled");
organize_id.value = data[0]['id'];
if(data['chkuser'] == true){
$("#noorg_th").text('ลงทะเบียนกับ '+data[0]['org_name_th']+' แล้ว');
$("#nameorg_th").text('');
$('#employee').attr("disabled",true);
$('#date').attr("disabled",true);
organize_id.value = '';
employee.value = '';
date.value = '';
}else if(data['chkuser'] == false){
$("#nameorg_th").text(data[0]['org_name_th']);
$("#noorg_th").text('');
$("#employee").removeAttr("disabled");
$("#date").removeAttr("disabled");
organize_id.value = data[0]['id'];
}
}else{
$("#noorg_th").text('ไม่พบข้อมูล');
$("#nameorg_th").text('');
......@@ -74,8 +83,8 @@
}
if (date.value == '') {
alert("วันเกิด");
date.focus();
return false;
date.focus();
}
}
</script>
......
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