vijayabharathambooks/vb_book
vijayabharathambooks/vb_book
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2023-08-25 16:51:46 +05:30
parent 000c4520e2
commit b134c30e65
8 changed files with 186 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Config/Routes.php
View File

@ -44,6 +44,8 @@ $routes->get("user_list/", "Users::index");
$routes->get("user_page/(:any)", "Users::user_page/$1");
$routes->post("user_synchronization", "Users::user_synchronization");
$routes->get("user_confirmation", "Users::user_confirmation");
# Books Routes
$routes->get("book_list/", "Books::index");
$routes->get("book_page/(:any)", "Books::book_page/$1");

5
app/Controllers/BaseController.php
View File

@ -61,7 +61,6 @@ abstract class BaseController extends Controller
$session_uid = get_logged_user_id('user_id');
$session_uname = get_logged_name('user_name');
$session_role = get_user_role('user_role');
if(!is_session_active()) {
$route = base_url()."login";
return redirect()->route($route);
@ -82,12 +81,12 @@ abstract class BaseController extends Controller
echo view('template/topbar.php', $data);
echo view($viewpage, $data);
echo view('template/footer.php', $data);
// $header = view('template/header.php', $data);
// $topbar = view('template/topbar.php', $data);
// $content = view($viewpage, $data);
// $footer = view('template/footer.php', $data);
// return $header . $topbar. $content . $footer;
// return $header.$topbar.$content.$footer;
}
}

2
app/Controllers/Business.php
View File

@ -17,7 +17,7 @@ class Business extends BaseController
$BusinessModel = new BusinessModel();
$data['page_name'] = 'Buiness Listing';
$data['businesses'] = $BusinessModel->findAll();
$data['businesses'] = $BusinessModel->where(['isactive'=>1])->findAll();
$this->render_page('business_list', $data);
} else {
// Session is not active or user is not logged in

74
app/Controllers/Users.php
View File

@ -3,6 +3,8 @@
namespace App\Controllers;
use App\Models\UsersModel;
use App\Models\BusinessModel;
use CodeIgniter\Files\File;
class Users extends BaseController
{
@ -10,13 +12,13 @@ class Users extends BaseController
public function index()
{
helper('session');
$session_role = get_user_role('user_role');
$session_bid = get_business_id('business_id');
$where = ['users.isactive' => 1];
if (!empty($session_role) && $session_role !== "sadmin") {
$where = ['users.business_id' => (int)$session_bid, 'users.isactive' => 1];
} else {
$where = ['users.isactive !=' => NULL];
}
$model = new UsersModel();
$model->setTable('users');
@ -29,6 +31,8 @@ class Users extends BaseController
## To Load User Add/Update page
public function user_page($id)
{
helper('session');
$session_role = get_user_role('user_role');
if ($id === '0') {
$data['page_name'] = 'Add User';
$data['details'] = [];
@ -36,12 +40,26 @@ class Users extends BaseController
$data['page_name'] = 'Edit User';
$model = new UsersModel();
$model->setTable('users');
$edit_user_details = $model->where(['user_id' => $id, 'isactive' => 1])->first();
if (!empty($session_role) && $session_role === "sadmin") {
$where = ['users.user_id' => $id, 'users.isactive !=' => NULL];
} else {
$where = ['users.user_id' => $id, 'users.isactive =' => 1];
}
$edit_user_details = $model->where($where)->first();
$data['details'] = $edit_user_details;
}
$business_details = !empty($session_role) && $session_role === "sadmin" ? $this->business_details() : [];
$data['business_details'] = $business_details;
$this->render_page('user_form', $data);
}
## For SuperAdmin Role business Dropdown displayed on Userpage.otherwise Hidden fields
public function business_details()
{
$model = new BusinessModel();
$model->setTable('business');
$business_details = $model->orderBy('business_id', 'DESC')->findAll();
return $business_details;
}
## To Save/Update User Data on DB.
public function user_synchronization()
@ -49,6 +67,43 @@ class Users extends BaseController
helper('session');
$session_bid = get_business_id();
$session_uid = get_logged_user_id();
$validationRule = [
'profile_picture' => [
'label' => 'Image File',
'rules' => [
'uploaded[profile_picture]',
'is_image[profile_picture]',
'mime_in[profile_picture,image/jpg,image/jpeg,image/gif,image/png,image/webp]',
'max_size[profile_picture,100]',
'max_dims[profile_picture,1024,768]',
],
],
];
if (! $this->validate($validationRule)) {
$data['success'] = '';
$data['errors'] = $this->validator->getErrors();
}
$img = $this->request->getFile('profile_picture');
$filePath = WRITEPATH . 'uploads/' . $this->request->getPost('profile_picture');
## File Already Existing or not
if (!is_file($filePath)) {
if (! $img->hasMoved()) {
// $filepath = WRITEPATH . 'uploads/' . $img->store();
// $data['uploaded_fileinfo'] = new File($filepath);
$fileName = $img->getName();
$img->move(WRITEPATH . 'uploads', $fileName);
$data['success'] = 'User Profile Uploaded';
$data['errors'] = '';
}else{
$data['success'] = '';
$data['errors'] = 'The file has already been moved.';
}
}
$model = new UsersModel();
$model->setTable('users');
if ($this->request->is('post')) {
@ -61,6 +116,8 @@ class Users extends BaseController
$requestData['isactive'] = isset($requestData['isactive']) && $requestData['isactive'] == 'on' ? 1 : 0;
unset($requestData['password']);
$model->saveData($requestData, $requestData['user_id']);
$data['success'] = 'User successfully updated.';
$data['errors'] = '';
$alert_message = "User successfully updated.";
} else {
#add
@ -69,8 +126,15 @@ class Users extends BaseController
$requestData['created_by'] = $session_uid;
$requestData['isactive'] = 1;
$model->saveData($requestData, null);
$data['success'] = 'User successfully created.';
$data['errors'] = '';
$alert_message = "User successfully created.";
}
return redirect()->route('user_list')->with('success', $alert_message);
// $data['page_name'] = 'User Confirmation';
// if(!empty($data['success'])){
// $this->render_page('user_confirmation', $data);
// }else{
return redirect()->route('user_list');
// }
}
}

14
app/Views/setting_form.php
View File

@ -20,24 +20,30 @@
<input type="text" class="form-control" id="site_title" name="site_title" placeholder="Site Title" value="<?= isset($details['site_title']) ? $details['site_title'] : '' ?>" required />
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12">
<label for="site_color" class="col-form-label">Site Color</label>
<input class="form-control" type="color" id="site_color" value="#3bafda">
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6">
<label for="site_info" class="col-form-label">Site Information<span class="text-danger">*</span></label>
<textarea class="form-control" id="site_info" name="site_info" placeholder="Site Information" value="<?= isset($details['site_info']) ? $details['site_info'] : '' ?>" required ></textarea>
<textarea class="form-control" id="site_info" name="site_info" placeholder="Site Information" required ><?= isset($details['site_info']) ? $details['site_info'] : '' ?></textarea>
</div>
<div class="form-group col-md-6">
<label for="about_info" class="col-form-label">About Information<span class="text-danger">*</span></label>
<textarea class="form-control" id="about_info" name="about_info" placeholder="About info" value="<?= isset($details['about_info']) ? $details['about_info'] : '' ?>" required ></textarea>
<textarea class="form-control" id="about_info" name="about_info" placeholder="About info" required ><?= isset($details['about_info']) ? $details['about_info'] : '' ?></textarea>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6">
<label for="terms_service" class="col-form-label">Terms Service<span class="text-danger">*</span></label>
<textarea class="form-control" id="terms_service" name="terms_service" placeholder="Terms Service" value="<?= isset($details['terms_service']) ? $details['terms_service'] : '' ?>" required rows="5"></textarea>
<textarea class="form-control" id="terms_service" name="terms_service" placeholder="Terms Service" required rows="5"><?= isset($details['terms_service']) ? $details['terms_service'] : '' ?></textarea>
</div>
<div class="form-group col-md-6">
<label for="footer_about" class="col-form-label">Footer about<span class="text-danger">*</span></label>
<textarea class="form-control" id="footer_about" name="footer_about" placeholder="Footer about" value="<?= isset($details['footer_about']) ? $details['footer_about'] : '' ?>" required rows="5"></textarea>
<textarea class="form-control" id="footer_about" name="footer_about" placeholder="Footer about" required rows="5"><?= isset($details['footer_about']) ? $details['footer_about'] : '' ?></textarea>
</div>
</div>
<div class="form-row">

4
app/Views/template/header.php
View File

@ -130,12 +130,14 @@
<span> Books </span>
</a>
</li>
<?php if($loggedin_person_role === 'sadmin'){ ?>
<li>
<a href="<?= base_url()."sitesetting_list"; ?>">
<i class="ri-list-settings-line"></i>
<span> Site Setting </span>
</a>
</li>
<?php } ?>
<li>
<a href="<?= base_url()."business_list"; ?>">
<i class="ri-briefcase-4-fill"></i>
@ -154,8 +156,6 @@
<span> Scheme </span>
</a>
</li>
</ul>
</div>

27
app/Views/user_confirmation.php Normal file
View File

@ -0,0 +1,27 @@
<div class="row">
<div class="col-lg-12">
<div class="card">
<div class="card-body">
<h3>Your file was successfully uploaded!</h3>
<ul>
<li>name: <?= esc($uploaded_fileinfo->getBasename()) ?></li>
<li>size: <?= esc($uploaded_fileinfo->getSizeByUnit('kb')) ?> KB</li>
<li>extension: <?= esc($uploaded_fileinfo->guessExtension()) ?></li>
</ul>
<?php if($errors == ''){ ?>
<p><?= anchor('user_list', 'Ok'); ?></p>
<?php }else { ?>
<ul>
<?php foreach ($errors as $error): ?>
<li><?= esc($error); ?></li>
<?php endforeach ?>
</ul>
<?php } ?>
</div> <!-- end card-body-->
</div> <!-- end card-->
</div> <!-- end col-->
</div>
<!-- end row -->

92
app/Views/user_form.php
View File

@ -3,48 +3,54 @@
<div class="card">
<div class="card-body">
<h4 class="header-title"><?= $page_name; ?></h4>
<p class="sub-header"> </p>
<?php if (session()->getFlashdata('success')): ?>
<div class="alert alert-success"><?= session()->getFlashdata('success') ?></div>
<?php endif; ?>
<form action="<?= base_url()."user_synchronization"; ?>" method="post">
<!-- <?php if (session()->getFlashdata('success')) : ?>
<div class="alert alert-success"><?= session()->getFlashdata('success') ?></div>
<?php endif; ?> -->
<form class="needs-validation" novalidate action="<?= base_url() . "user_synchronization"; ?>" method="post" enctype="multipart/form-data">
<div class="form-group">
<div class="form-row">
<div class="form-group col-md-4">
<label for="user_name" class="col-form-label">User Name<span class="text-danger">*</span></label>
<input type="text" class="form-control" id="user_name" name="user_name" value="<?= isset($details['user_name']) ? $details['user_name'] : '' ?>" placeholder="User Name" required />
<div class="invalid-feedback"> Please provide. </div>
</div>
<div class="form-group col-md-4">
<label for="email" class="col-form-label">Email<span class="text-danger">*</span></label>
<input type="email" class="form-control" id="email" name="email" placeholder="Email" value="<?= isset($details['email']) ? $details['email'] : '' ?>" required />
<div class="invalid-feedback"> Please provide. </div>
</div>
<?php if(empty($details)){ ?>
<?php if (empty($details)) { ?>
<div class="form-group col-md-4">
<label for="password" class="col-form-label">Password<span class="text-danger">*</span></label>
<input type="text" class="form-control" id="password" name="password" placeholder="Password" value="<?= isset($details['password']) ? $details['password'] : '' ?>" required />
<div class="invalid-feedback"> Please provide. </div>
</div>
<?php } ?>
</div>
<div class="form-row">
<div class="form-group col-md-6">
<label for="first_name" class="col-form-label">First Name<span class="text-danger">*</span></label>
<input type="text" class="form-control" id="first_name" name="first_name" placeholder="First Name" value="<?= isset($details['first_name']) ? $details['first_name'] : '' ?>" required />
<div class="invalid-feedback"> Please provide. </div>
</div>
<div class="form-group col-md-6">
<label for="last_name" class="col-form-label">Last Name<span class="text-danger">*</span></label>
<input type="text" class="form-control" id="last_name" name="last_name" placeholder="Last Name" value="<?= isset($details['last_name']) ? $details['last_name'] : '' ?>" required />
<div class="invalid-feedback"> Please provide. </div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6">
<label for="date_of_birth" class="col-form-label">Date Of Birth<span class="text-danger">*</span></label>
<input type="date" class="form-control" id="date_of_birth" name="date_of_birth" placeholder="Date Of birth (format : DD/MM/YYYY)" required data-toggle="input-mask" data-mask-format="00/00/0000" value="<?= isset($details['date_of_birth']) ? $details['date_of_birth'] : '' ?>" />
<div class="invalid-feedback"> Please provide. </div>
</div>
<div class="form-group col-md-6">
<label for="mobile_no" class="col-form-label">Mobile Number<span class="text-danger">*</span></label>
<input type="number" class="form-control" id="mobile_no" name="mobile_no" placeholder="Mobile Number (Enter only numbers)" required data-parsley-type="number" value="<?= isset($details['mobile_no']) ? $details['mobile_no'] : '' ?>" />
<div class="invalid-feedback"> Please provide. </div>
</div>
</div>
<div class="form-row">
@ -55,40 +61,64 @@
<div class="form-group col-md-3">
<label for="role" class="col-form-label">Role<span class="text-danger">*</span></label>
<input type="text" class="form-control" id="role" name="role" placeholder="Role" required value="<?= isset($details['role']) ? $details['role'] : '' ?>" />
<div class="invalid-feedback"> Please provide. </div>
</div>
<div class="form-group col-md-3">
<label for="profile_picture" class="col-form-label">Profile Picture<span class="text-danger">*</span></label>
<br/>
<input type="file" id="profile_picture" name="profile_picture" placeholder="Profile picture Name" required value="<?= isset($details['profile_picture']) ? $details['profile_picture'] : '' ?>" />
<!-- <input type="text" class="form-control" id="profile_picture" name="profile_picture" placeholder="Profile picture Name" required value="<?= isset($details['profile_picture']) ? $details['profile_picture'] : '' ?>" /> -->
<?php if (isset($details['profile_picture']) && $details['profile_picture']) { ?>
<!-- <input type="text" class="form-control" id="profile_picture" name="profile_picture" placeholder="Profile picture Name" readonly value="<?= isset($details['profile_picture']) ? $details['profile_picture'] : '' ?>" /> -->
<br></t><a href="" data-toggle="modal" data-target="#standard-modal"><i class="fas fa-image"></i><?= isset($details['profile_picture']) ? " " . $details['profile_picture'] : '' ?></a>
<input type="hidden" name="profile_picture" placeholder="hidden Field for profile picture" readonly value="<?= isset($details['profile_picture']) ? $details['profile_picture'] : '' ?>" />
<?php } else { ?>
<input type="file" class="form-control" style="border: 0px !important;" id="profile_picture" name="profile_picture" placeholder="Profile picture Name" required value="<?= isset($details['profile_picture']) ? $details['profile_picture'] : '' ?>" />
<div class="invalid-feedback"> Please provide. </div>
<?php } ?>
</div>
</div>
<div class="form-group">
<label for="address" class="col-form-label">Address<span class="text-danger">*</span></label>
<input type="text" class="form-control" id="address" name="address" placeholder="Address (eg : 1234 Main St)" required value="<?= isset($details['address']) ? $details['address'] : '' ?>" />
<div class="invalid-feedback"> Please provide. </div>
</div>
<div class="form-row">
<div class="form-group col-md-6">
<label for="city" class="col-form-label">City<span class="text-danger">*</span></label>
<input type="text" class="form-control" id="city" name="city" placeholder="City" required value="<?= isset($details['city']) ? $details['city'] : '' ?>" />
<div class="invalid-feedback"> Please provide. </div>
</div>
<div class="form-group col-md-4">
<label for="state" class="col-form-label">State<span class="text-danger">*</span></label>
<input type="text" class="form-control" id="state" name="state" placeholder="State" required value="<?= isset($details['state']) ? $details['state'] : '' ?>" />
<div class="invalid-feedback"> Please provide. </div>
</div>
<div class="form-group col-md-2">
<label for="postal_code" class="col-form-label">Postal Code<span class="text-danger">*</span></label>
<input type="text" class="form-control" id="postal_code" name="postal_code" placeholder="Postal Code (PIN)" required value="<?= isset($details['postal_code']) ? $details['postal_code'] : '' ?>" />
<div class="invalid-feedback"> Please provide. </div>
</div>
</div>
<input type="hidden" id="user_id" name="user_id" placeholder="hidden for user id" value="<?= isset($details['user_id']) ? $details['user_id'] : '' ?>" />
<input type="hidden" id="business_id" name="business_id" placeholder="hidden for business id" value="<?= isset($details['business_id']) ? $details['business_id'] : '' ?>" />
<?php if(!empty($details)){ ?>
<div class="form-group text-right m-b-0 checkbox checkbox-purple">
<input type="checkbox" id="isactive" name="isactive" class="form-control" <?= isset($details) && $details['isactive'] == 1 ? 'checked' : '' ?>>
<label for="isactive"> Is Active</label>
<?php if($loggedin_person_role === 'sadmin'){ ?>
<div class="form-row">
<div class="form-group col-md-6">
<label for="postal_code" class="col-form-label">Buiness<span class="text-danger">*</span></label>
<select id="business_id" name="business_id" class="form-control">
<option value=null>Choose your Buiness</option>
<?php foreach ($business_details as $value) { ?>
<option value="<?php echo $value['business_id']; ?>" <?php if (isset($details['business_id']) && ($details['business_id'] === $value['business_id'])) echo "selected"; ?>><?php echo $value['title']; ?></option>
<?php } ?>
</select>
</div>
</div>
<br>
<?php }else{ ?>
<input type="hidden" id="business_id" name="business_id" placeholder="hidden for business id" value="<?= isset($details['business_id']) ? $details['business_id'] : '' ?>" />
<?php } ?>
<input type="hidden" id="user_id" name="user_id" placeholder="hidden for user id" value="<?= isset($details['user_id']) ? $details['user_id'] : '' ?>" />
<?php if (!empty($details)) { ?>
<div class="form-group text-right m-b-0 checkbox checkbox-purple">
<input type="checkbox" id="isactive" name="isactive" class="form-control" <?= isset($details) && $details['isactive'] == 1 ? 'checked' : '' ?>>
<label for="isactive"> Is Active</label>
</div>
<br>
<?php } ?>
<div class="form-group text-right m-b-0">
<button class="btn btn-success waves-effect waves-light mr-1" type="submit">
@ -97,7 +127,8 @@
<button type="reset" class="btn btn-primary waves-effect mr-1">
Reset
</button>
<button type="button" class="btn btn-secondary waves-effect">Cancel</button>
<a href="<?= base_url() . "user_list"; ?>" class="btn btn-secondary waves-effect">Cancel </a>
<!-- <button id="cancelButton" type="button" class="btn btn-secondary waves-effect">Cancel</button> -->
</div>
</div>
</form>
@ -105,4 +136,27 @@
</div> <!-- end card-->
</div> <!-- end col-->
</div>
<!-- end row -->
<!-- end row -->
<?php if (isset($details['profile_picture']) && $details['profile_picture']) { ?>
<!-- Standard modal content -->
<div id="standard-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="standard-modalLabel" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h4 class="modal-title" id="standard-modalLabel">Modal Heading</h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
</div>
<div class="modal-body">
<div class="col-md-12">
<img src="<?= base_url()."writable/uploads/".$details['profile_picture'] ?>" class="img-fluid rounded" />
<!-- /opt/lampp/htdocs/vb_book/writable/uploads/writable/uploads/".$details['profile_picture'] -->
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-light" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-primary"><i class="mdi mdi-cloud-upload mr-1"></i>Another Upload</button>
</div>
</div><!-- /.modal-content -->
</div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<?php } ?>