Bigbamboo/bb_sign
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge : GWM

Browse Source
This commit is contained in:
bitbucket 2024-06-05 15:24:38 +05:30
parent f8d2769d99
commit 287b40b4fc
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Controllers/MasterController.php
View File

@ -81,7 +81,7 @@ class MasterController extends BaseController
$staffdata = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow(); $staffdata = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow();
echo view('layout/header', ['Data'=>$staffdata]); echo view('layout/header', ['Data'=>$staffdata]);
echo view('service_form',); echo view('service_form');
echo view('layout/footer'); echo view('layout/footer');
} }
} }
@ -165,6 +165,7 @@ class MasterController extends BaseController
$id = $this->request->getVar('service_id'); $id = $this->request->getVar('service_id');
$data['serviceData'] = $this->ServiceModel->where('md5(service_id)',$id)->get()->getRow(); $data['serviceData'] = $this->ServiceModel->where('md5(service_id)',$id)->get()->getRow();
$data['AllServiceData'] = $this->ServiceModel->where('branch_id',$this->session->get('logged_in_staff_branch_id'))->findAll();
$staffdata = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow(); $staffdata = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow();
echo view('layout/header', ['Data'=>$staffdata]); echo view('layout/header', ['Data'=>$staffdata]);
@ -180,7 +181,7 @@ class MasterController extends BaseController
$id = $this->request->getVar('template_id'); $id = $this->request->getVar('template_id');
$data['templateData'] = $this->TemplateModel->where('md5(template_id)',$id)->get()->getRow(); $data['templateData'] = $this->TemplateModel->where('md5(template_id)',$id)->get()->getRow();
$data['serviceData'] = $this->ServiceModel->where('service_id',$data['templateData']->service_id)->get()->getRow(); $data['serviceData'] = $this->ServiceModel->where('service_id',$data['templateData']->service_id)->get()->getRow();
$data['AllServiceData'] = $this->ServiceModel->where('branch_id',$this->session->get('logged_in_staff_branch_id'))->findAll();
$staffdata = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow(); $staffdata = $this->StaffModel->where('staff_id',$this->session->get('is_staff_logged_in'))->get()->getRow();
echo view('layout/header', ['Data'=>$staffdata]); echo view('layout/header', ['Data'=>$staffdata]);
echo view('template_form',$data); echo view('template_form',$data);

3
app/Views/client_docs_preview.php
View File

@ -31,8 +31,9 @@
</h4> </h4>
<div class="page-title-right"> <div class="page-title-right">
<a onclick="window.history.back()" class="btn btn-secondary waves-effect waves-light"> Close </a> <a onclick="window.history.back()" class="btn btn-secondary waves-effect waves-light"> Close </a>
<a href="#" class="btn btn-danger waves-effect waves-light" data-toggle="modal" data-target="#reject-modal"> Reject </a>
<?php if($docData->is_approved != 1){ ?> <?php if($docData->is_approved != 1){ ?>
<a href="#" class="btn btn-danger waves-effect waves-light" data-toggle="modal" data-target="#reject-modal"> Reject </a>
<a href="#" data-toggle="modal" data-target="#approve-modal" class="btn btn-primary waves-effect waves-light"> Approve </a> <a href="#" data-toggle="modal" data-target="#approve-modal" class="btn btn-primary waves-effect waves-light"> Approve </a>
<?php } ?> <?php } ?>
</div> </div>

25
app/Views/template_form.php
View File

@ -2,7 +2,18 @@
<!-- ============================================================== --> <!-- ============================================================== -->
<!-- Start Page Content here --> <!-- Start Page Content here -->
<!-- ============================================================== --> <!-- ============================================================== -->
<style>
.select2-container .select2-selection--single{
height: 36px;
border:1px solid #ced4da;
}
.select2-container--default .select2-selection--single .select2-selection__rendered{
line-height: 36px;
}
.select2-container--default .select2-selection--single .select2-selection__arrow{
top:4px;
}
</style>
<div class="content-page"> <div class="content-page">
<!-- Start Content--> <!-- Start Content-->
<div class="container-fluid"> <div class="container-fluid">
@ -34,10 +45,14 @@
<form id="template-form"> <form id="template-form">
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="messageto-input">Service </label> <label for="vs_category">Service<span class="text-danger">*</span></label>
<input type="text" class="form-control" value="<?= $serviceData->service_name; ?>" readonly> <select class="select2-dropdown form-control" id="service_id" required>
<input type="hidden" class="form-control" value="<?= $serviceData->service_id; ?>" id="service_id"> <?php foreach ($AllServiceData as $key => $value) { ?>
<option value="<?php echo $value['service_id']; ?>" <?php if(isset($serviceData)){ echo ($value['service_id'] == $serviceData->service_id) ? 'selected' : ''; } ?> ><?php echo $value['service_name']; ?></option>
<?php } ?>
</select>
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
@ -191,7 +206,7 @@ $("#savedata").on("click", function()
$(document).ready(function() { $(document).ready(function() {
$('.select2-dropdown').select2();
$('#summernote-basic').summernote({ $('#summernote-basic').summernote({