RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

Browse Source
This commit is contained in:
aadhavan valli 2024-08-31 19:07:42 +05:30
commit bedb4aa236
27 changed files with 1047 additions and 953 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Views/addRawMaterial.php
View File

@ -26,14 +26,14 @@
<!-- Start Content--> <!-- Start Content-->
<div class="container-fluid"> <div class="container-fluid">
<!-- start page title --> <!-- start page title -->
<div class="row"> <div class="row" style="margin-bottom: 10px;">
<div class="col-6"> <div class="col-6">
<div class="page-title-box page-title-box-alt"> <div class="page-title-box page-title-box-alt">
<h4 class="page-title">Add Material Details</h4> <h4 class="page-title">Add Material Details</h4>
</div> </div>
</div> </div>
<div class="col-6 text-right"> <div class="col-6 text-right">
<a class="btn btn-cancel" href="<?php echo base_url(); ?>rawmaterialListing">&nbsp;&nbsp;<span class="bold">Back</span></a> <a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>rawmaterialListing"><span class="bold">Back</span></a>
</div> </div>
</div> </div>
<!-- end page title --> <!-- end page title -->

45
app/Views/addSupplier.php
View File

@ -38,14 +38,13 @@
<!-- form start --> <!-- form start -->
</div> </div>
<!-- start page title --> <!-- start page title -->
<div class="row"> <div class="row" style="margin-bottom: 10px;">
<div class="col-6"> <div class="col-6">
<div class="page-title-box page-title-box-alt"> <div class="page-title-box page-title-box-alt">
<h4 class="page-title"> Add Supplier Details</h4> <h4 class="page-title"> Add Supplier Details</h4>
</div> </div>
</div> </div>
<div class="col-6 text-right"> <div class="col-6 text-right">
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>supplierlisting"><span class="bold">Back</span></a> <a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>supplierlisting"><span class="bold">Back</span></a>
</div> </div>
</div> </div>
@ -53,16 +52,15 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body" style="padding: 1rem 2rem !important;">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="p-2">
<form class="form-horizontal" role="form" id="addsupplier" action="<?php echo base_url() ?>addNewsupplier" method="post" role="form" enctype="multipart/form-data"> <form class="form-horizontal" role="form" id="addsupplier" action="<?php echo base_url() ?>addNewsupplier" method="post" role="form" enctype="multipart/form-data">
<div class="box-body"> <div class="box-body">
<!-- Supplier Information --> <!-- Supplier Information -->
<legend style="margin-left:-10px">Supplier Information</legend> <legend style="margin-left:-10px;color: #4f7c97;">Supplier Information</legend>
<div class="col-md-12" style="margin-bottom: 27px;"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="form-row"> <div class="form-row" style="margin-bottom:10px;">
<div class=" col-md-3"> <div class=" col-md-3">
<label class="col-form-label" for="SupplierName">Supplier Name<span class="badge">*</span></label> <label class="col-form-label" for="SupplierName">Supplier Name<span class="badge">*</span></label>
<input type="text" name="SupplierName" maxlength="100" id="supplierName" class="form-control" required> <input type="text" name="SupplierName" maxlength="100" id="supplierName" class="form-control" required>
@ -81,17 +79,17 @@
</div> </div>
</div> </div>
<div class="form-row" > <div class="form-row" >
<div class="col-md-12" style="margin-top:20px"> <div class="col-md-12" style="margin-top:5px">
<label for="SupplierType">Supplier Type</label><!--<span class="badge">*</span>--> <label for="SupplierType">Supplier Type</label><!--<span class="badge">*</span>-->
&ensp; &ensp;
</div> </div>
<div class="col-md-1" style="margin-top:20px"> <div class="col-md-1" style="margin-top:5px">
<input type="checkbox" id="service" name="service" value="<?php echo $service = (isset($_POST['service'])) ? 0 : 1; ?>"> <b>SERVICE &ensp;</b> <input type="checkbox" id="service" name="service" value="<?php echo $service = (isset($_POST['service'])) ? 0 : 1; ?>"> <b>SERVICE &ensp;</b>
</div> </div>
<div class="col-md-1.5" style="margin-top:20px"> <div class="col-md-1.5" style="margin-top:5px">
<input type="checkbox" id="rawmaterial" name="rawmaterial" value="<?php echo $rawmaterial = (isset($_POST['rawmaterial'])) ? 0 : 1; ?>"> <b>RAW MATERIALS &ensp;</b> <input type="checkbox" id="rawmaterial" name="rawmaterial" value="<?php echo $rawmaterial = (isset($_POST['rawmaterial'])) ? 0 : 1; ?>"> <b>RAW MATERIALS &ensp;</b>
</div> </div>
<div class="col-md-2" style="margin-top:20px"> <div class="col-md-2" style="margin-top:5px">
<input type="checkbox" id="maintanance" name="maintanance" value="<?php echo $maintanance = (isset($_POST['maintanance'])) ? 0 : 1; ?>"> <b>MAINTENANCE &ensp;</b> <input type="checkbox" id="maintanance" name="maintanance" value="<?php echo $maintanance = (isset($_POST['maintanance'])) ? 0 : 1; ?>"> <b>MAINTENANCE &ensp;</b>
</div> </div>
</div> </div>
@ -99,18 +97,18 @@
</div> </div>
<!-- Address Section --> <!-- Address Section -->
<legend style="margin-left:-10px">Address Details</legend> <legend style="margin-left:-10px;color: #4f7c97;">Address Details</legend>
<div class="col-md-12" style="margin-bottom: 27px;"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="form-row"> <div class="form-row">
<div class=" col-md-6"> <div class=" col-md-6">
<label class="col-form-label" for="Address2">Address<span class="badge">*</span></label> <label class="col-form-label" for="Address2">Address<span class="badge">*</span></label>
<input type="text" class="form-control required" id="Address" name="Address" maxlength="500" style="height: 70px;" required> <textarea type="text" class="form-control required" id="Address" name="Address" maxlength="500" required rows="3"></textarea>
</div> </div>
</div> </div>
</div> </div>
<!-- Tax Related Data --> <!-- Tax Related Data -->
<legend style="margin-left:-10px">Tax Related Data</legend> <legend style="margin-left:-10px;color: #4f7c97;">Tax Related Data</legend>
<!-- Text input--> <!-- Text input-->
<div class="col-md-12" style="margin-bottom: 27px;"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="form-row" style="margin-bottom: 20px;"> <div class="form-row" style="margin-bottom: 20px;">
@ -122,9 +120,9 @@
<label class="col-form-label" for="PAN">PAN</label> <label class="col-form-label" for="PAN">PAN</label>
<input type="text" id="panno" maxlength="10" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" name="panno" style="text-transform:uppercase;" onchange="validatePAN();" class="form-control" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character should be in caps)" onkeypress="return alphaNumberic(event)"> <input type="text" id="panno" maxlength="10" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" name="panno" style="text-transform:uppercase;" onchange="validatePAN();" class="form-control" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character should be in caps)" onkeypress="return alphaNumberic(event)">
</div> </div>
<div class=" col-md-3"> <div class=" col-md-4">
<label for="Cert_GST">Select GST Document<br/><small>(only .pdf, .doc, .png, .jpg)</small></label> <label class="col-form-label" for="Cert_GST">Select GST Document<small> (only .pdf, .doc, .png, .jpg)</small></label>
<input type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_GST" name="Cert_GST"/> <input style="margin-top: 5px;" type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_GST" name="Cert_GST"/>
</div> </div>
</div> </div>
@ -133,15 +131,15 @@
<label class="col-form-label" for="MSME">MSME</label> <label class="col-form-label" for="MSME">MSME</label>
<input type="text" id="MSMENo" name="MSME" class="form-control" maxlength="30"> <input type="text" id="MSMENo" name="MSME" class="form-control" maxlength="30">
</div> </div>
<div class=" col-md-3"> <div class=" col-md-4">
<label for="Cert_MSME">Select MSME Document<br/><small>(only .pdf, .doc, .png, .jpg)</small></label> <label class="col-form-label" for="Cert_MSME">Select MSME Document<small> (only .pdf, .doc, .png, .jpg)</small></label>
<input type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_MSME" name="Cert_MSME"/> <input style="margin-top: 5px;" type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_MSME" name="Cert_MSME"/>
</div> </div>
</div> </div>
</div> </div>
<!-- Bank Details--> <!-- Bank Details-->
<legend style="margin-left:-10px">Bank Details</legend> <legend style="margin-left:-10px;color: #4f7c97;">Bank Details</legend>
<div class="col-md-12" style="margin-bottom: 27px;"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="form-row"> <div class="form-row">
@ -164,8 +162,8 @@
<input type="text" id="bankaddress" name="bankaddress" maxlength="200" class="form-control" required> <input type="text" id="bankaddress" name="bankaddress" maxlength="200" class="form-control" required>
</div> </div>
<div class=" col-md-4"> <div class=" col-md-4">
<label for="Cert_BANK">Select Bank Document<br/><small>(only .pdf, .doc, .png, .jpg)</small></label> <label class="col-form-label" for="Cert_BANK">Select Bank Document<small> (only .pdf, .doc, .png, .jpg)</small></label>
<input type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_BANK" name="Cert_BANK"/> <input style="margin-top: 5px;" type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_BANK" name="Cert_BANK"/>
</div> </div>
</div> </div>
@ -177,7 +175,7 @@
</div> </div>
</div> </div>
<legend style="margin-left:-10px">Payment Details</legend> <legend style="margin-left:-10px;color: #4f7c97;">Payment Details</legend>
<!-- Text input--> <!-- Text input-->
@ -208,7 +206,6 @@
</form> </form>
</div> </div>
</div> </div>
</div>
<!-- end row --> <!-- end row -->
</div> </div>
</div> <!-- end card --> </div> <!-- end card -->

4
app/Views/addUser.php
View File

@ -3,14 +3,14 @@
<!-- Start Content--> <!-- Start Content-->
<div class="container-fluid"> <div class="container-fluid">
<!-- start page title --> <!-- start page title -->
<div class="row"> <div class="row" style="margin-bottom: 10px;">
<div class="col-6"> <div class="col-6">
<div class="page-title-box page-title-box-alt"> <div class="page-title-box page-title-box-alt">
<h4 class="page-title">Add User Details</h4> <h4 class="page-title">Add User Details</h4>
</div> </div>
</div> </div>
<div class="col-6 text-right"> <div class="col-6 text-right">
<a class="btn btn-cancel" href="<?php echo base_url(); ?>userListing">&nbsp;&nbsp;<span class="bold">Back</span></a> <a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>userListing"><span class="bold">Back</span></a>
</div> </div>
</div> </div>
<!-- end page title --> <!-- end page title -->

6
app/Views/addasset.php
View File

@ -3,7 +3,7 @@
<!-- Start Content--> <!-- Start Content-->
<div class="container-fluid"> <div class="container-fluid">
<!-- start page title --> <!-- start page title -->
<div class="row"> <div class="row" style="margin-bottom: 10px;">
<div class="col-6"> <div class="col-6">
<div class="page-title-box page-title-box-alt"> <div class="page-title-box page-title-box-alt">
<h4 class="page-title"> Add Asset Details</h4> <h4 class="page-title"> Add Asset Details</h4>
@ -17,10 +17,9 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body" style="padding: 1rem 2rem !important;">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="p-2">
<form role="form" id="addAsset" action="<?php echo base_url() ?>addNewasset" method="post"> <form role="form" id="addAsset" action="<?php echo base_url() ?>addNewasset" method="post">
<div class="box-body"> <div class="box-body">
<!-- Supplier Information --> <!-- Supplier Information -->
@ -159,7 +158,6 @@
</div> </div>
</form> </form>
</div> </div>
</div>
<?php <?php
$listErrors = session()->getFlashdata('listErrors'); $listErrors = session()->getFlashdata('listErrors');
if ($listErrors) { if ($listErrors) {

22
app/Views/addconfig.php
View File

@ -9,7 +9,7 @@
<!-- Start Content--> <!-- Start Content-->
<div class="container-fluid"> <div class="container-fluid">
<!-- start page title --> <!-- start page title -->
<div class="row"> <div class="row" style="margin-bottom: 10px;">
<div class="col-6"> <div class="col-6">
<div class="page-title-box page-title-box-alt"> <div class="page-title-box page-title-box-alt">
<h4 class="page-title"> Add Config Details</h4> <h4 class="page-title"> Add Config Details</h4>
@ -42,7 +42,7 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body" style="padding: 1rem 2rem !important;">
<form role="form" id="addconfig" action="<?php echo base_url() ?>configurationctrl/saveconfig" method="post"> <form role="form" id="addconfig" action="<?php echo base_url() ?>configurationctrl/saveconfig" method="post">
<div class="form-row" style="margin-top:10px"> <div class="form-row" style="margin-top:10px">
<div class=" col-md-3"> <div class=" col-md-3">
@ -51,8 +51,6 @@
$data = array('name' => 'configurationname', 'value' => set_value('configurationname'), 'id' => 'configurationname', 'class' => 'form-control', 'required' => 'true', 'maxlength' => '20'); $data = array('name' => 'configurationname', 'value' => set_value('configurationname'), 'id' => 'configurationname', 'class' => 'form-control', 'required' => 'true', 'maxlength' => '20');
echo form_input($data); ?> echo form_input($data); ?>
</div> </div>
</div>
<div class="form-row" style="margin-top:10px">
<div class=" col-md-3"> <div class=" col-md-3">
<label class="col-form-label" for="Comments">Comments</label> <label class="col-form-label" for="Comments">Comments</label>
<?php <?php
@ -130,13 +128,9 @@
<div class="modal-content"> <div class="modal-content">
<!-- Modal Header --> <!-- Modal Header -->
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal"> <h4 class="modal-title" id="myModalLabel">Add Configuration</h4>
<span aria-hidden="true">&times;</span> <button type="button" class="close" data-dismiss="modal"
<span class="sr-only">Close</span> aria-hidden="true">×</button>
</button>
<h4 class="modal-title" id="myModalLabel">
<center> Add Configuration</center>
</h4>
</div> </div>
<!-- Modal Body --> <!-- Modal Body -->
@ -146,7 +140,7 @@
<div class="form-group"> <div class="form-group">
<div class="row"> <div class="row">
<div class="col-md-3 col-md-offset-2"> <div class="col-md-4">
Configuration Value : Configuration Value :
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
@ -162,8 +156,8 @@
<!-- Modal Footer --> <!-- Modal Footer -->
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a> <a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success font tempClickAdd" ID="tempClickAdd" style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a> <a class="btn btn-success font tempClickAdd" ID="tempClickAdd" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
</div> </div>
</div> </div>
</div> </div>

22
app/Views/adddepartment.php
View File

@ -13,7 +13,7 @@
<!-- Start Content--> <!-- Start Content-->
<div class="container-fluid"> <div class="container-fluid">
<!-- start page title --> <!-- start page title -->
<div class="row"> <div class="row" style="margin-bottom: 10px;">
<div class="col-6"> <div class="col-6">
<div class="page-title-box page-title-box-alt"> <div class="page-title-box page-title-box-alt">
<h4 class="page-title">Add Department Details</h4> <h4 class="page-title">Add Department Details</h4>
@ -27,23 +27,20 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body" style="padding: 1rem 2rem !important;">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="p-2">
<form role="form" id="adddepartment" action="<?php echo base_url() ?>savedepartment" method="post"> <form role="form" id="adddepartment" action="<?php echo base_url() ?>savedepartment" method="post">
<div class="box-body"> <div class="box-body">
<!-- Supplier Information --> <!-- Supplier Information -->
<div class="col-md-12" style="margin-bottom: 27px;"> <div class="col-md-12" style="margin-bottom: 27px;">
<legend>Department Information</legend> <legend style="margin-left:-10px;color: #4f7c97;">Department Information</legend>
<div class="form-row" style="margin-top:10px"> <div class="form-row" style="margin-top:10px">
<div class=" col-md-3"> <div class="col-md-4">
<label class="col-form-label" for="DepartmentName">Department Name<span class="badge">*</span></label> <label class="col-form-label" for="DepartmentName">Department Name<span class="badge">*</span></label>
<input type="text" name="DepartmentName" id="DepartmentName" class="form-control" required> <input type="text" name="DepartmentName" id="DepartmentName" class="form-control" required>
</div> </div>
</div> <div class="col-md-4">
<div class="form-row" style="margin-top:10px">
<div class=" col-md-3">
<label class="col-form-label" for="HeadDepartment">Head Department<span class="badge">*</span></label> <label class="col-form-label" for="HeadDepartment">Head Department<span class="badge">*</span></label>
<select class="form-control required" id="HeadDept" name="HeadDept"> <select class="form-control required" id="HeadDept" name="HeadDept">
<option value="-1" required>Select Department Code</option> <option value="-1" required>Select Department Code</option>
@ -61,11 +58,9 @@
</select> </select>
</div> </div>
</div> <div class="col-md-4 d-flex align-items-center">
<div class="form-row" style="margin-top:10px"> <input type="checkbox" id="IsActive" name="IsActive" style="margin-top: 16px;">
<div class="col-md-3"> <span for="Active" style="margin-top: 16px;">&nbsp;&nbsp;&nbsp;Is Active</span>
<input type="checkbox" id="IsActive" name="IsActive" >
<span for="Active">Is Active</span>
</div> </div>
</div> </div>
</div> </div>
@ -105,7 +100,6 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<!-- end row --> <!-- end row -->
</div> </div>
</div> <!-- end card --> </div> <!-- end card -->

373
app/Views/attendance.php
View File

@ -1,24 +1,27 @@
<script src="<?php echo base_url()?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script> <script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
<script src="<?php echo base_url()?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script> <script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
<script src="<?php echo base_url()?>public/assets/js/jquery.CongelarFilaColumna.js"></script> <script src="<?php echo base_url() ?>public/assets/js/jquery.CongelarFilaColumna.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.5.0/js/bootstrap-datepicker.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.5.0/js/bootstrap-datepicker.js"></script>
<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.5.0/css/bootstrap-datepicker.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.5.0/css/bootstrap-datepicker.css"
rel="stylesheet">
<?php <?php
$datefordropdown = format_date($datefordropdown, 0, 'M-Y'); $datefordropdown = format_date($datefordropdown, 0, 'M-Y');
$attendance = array_merge($attendance,$emppay); //echo $datefordropdown;
date_default_timezone_set('Asia/Kolkata'); $attendance = array_merge($attendance, $emppay);
$currentday = date('d'); date_default_timezone_set('Asia/Kolkata');
?> $currentday = date('d');
// print_r($attendance);
// echo "<br>------------------------------<br>";
?>
<style type="text/css"> <style type="text/css">
.num { .num {
text-align: right; text-align: right;
} }
#month{
margin-top: 8px;
}
.fht-table, .fht-table,
.fht-table thead, .fht-table thead,
@ -30,11 +33,6 @@
margin: 0; margin: 0;
} }
th{
color: white;
background-color: #d1d6d17a !important;
}
.fht-table td { .fht-table td {
text-align: center; text-align: center;
} }
@ -180,8 +178,6 @@
padding-right: 30% ! important; padding-right: 30% ! important;
} }
</style> </style>
<div class="content-page"> <div class="content-page">
<div class="content"> <div class="content">
<!-- Start Content--> <!-- Start Content-->
@ -208,7 +204,7 @@
<div class="row"> <div class="row">
<div class="col-3"> <div class="col-3">
<?php $today = date('M-Y'); <?php $today = date('M-Y');
$data = array('type' => 'text','name' => 'month','id' => 'month','value' => $datefordropdown,'class' => 'form-control select2'); $data = array('type' => 'text', 'name' => 'month', 'id' => 'month', 'value' => $datefordropdown, 'class' => 'form-control select2');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -219,86 +215,110 @@
</div> </div>
<?php <?php
$testarray=array();
$testarray = array();
$finalarray = array(); $finalarray = array();
if(!empty($attendance)) if (!empty($attendance)) {
{
foreach($attendance as $record) foreach ($attendance as $record) {
{ //$index++;
if(in_array($record->EmpID,$testarray)) if (in_array($record->EmpID, $testarray)) {
{ //$index--;
// Skip duplicate employee IDs } else {
} array_push($testarray, $record->EmpID);
else array_push($finalarray, $record);
{
array_push($testarray,$record->EmpID);
array_push($finalarray,$record);
} }
} }
} }
?> ?>
<!-- Add table-responsive for horizontal scroll --> <!-- Add table-responsive for horizontal scroll -->
<div class="table-responsive"> <div class="table-responsive">
<table id="attendance" class="fht-table table table-striped"> <table id="attendance" class="fht-table table table-striped">
<thead> <thead>
<tr> <tr>
<th class="celda_encabezado_general" rowspan="2">S.NO</th> <th class="celda_encabezado_general" rowspan="2">S.NO</th>
<th class="celda_encabezado_general" rowspan="2">Employee ID</th> <th class="celda_encabezado_general" rowspan="2">Employee ID</th>
<th style="background-color: #00a65a;color:#fff;border:5px" rowspan="2"> <th style="background-color: #00a65a;color:#fff;border:5px"
Employee Name</th> rowspan="2">Employee Name</th>
<?php <?php
for ($col =1; $col <= $monthdays;$col++){
for ($col = 1; $col <= $monthdays; $col++) {
$flag = 0; $flag = 0;
$flag2 = 0; $flag2 = 0;
$todayflag = 0; $todayflag = 0;
if($col == $currentday) {
if ($col == $currentday) {
$todayflag = 1; $todayflag = 1;
} }
foreach($sundayarray as $in) { foreach ($sundayarray as $in) //For Find out Sundays($ind) from $monthdays array
if($in == $col) { {
if ($in == $col) {
$flag = 1; $flag = 1;
} }
} }
$title = ''; $title = '';
foreach($publicholidaysarray as $h) { foreach ($publicholidaysarray as $h) //For Find out public holidays from $monthdays array
{
$temp = $h->H_Date; $temp = $h->H_Date;
$temp = substr($temp,8); $temp = substr($temp, 8);
if($temp == $col) {
if ($temp == $col) {
$flag2 = 1; $flag2 = 1;
$title = str_replace(" ","_",$h->H_Name); //$title ="Public Holiday-" . str_replace(" ","_",$h->H_Name);
$title = str_replace(" ", "_", $h->H_Name);
//echo $title;
} }
} }
?> ?>
<th <?php if($flag2 == 1){ ?> title="<?php echo $title; ?>" <?php } else if($flag == 1 ){ ?> title="sunday" <?php }?>
class="celda_encabezado_general"
<?php if($flag == 1 or $flag2 == 1) {
echo "style='background: #f39c12 ;'";
} else if($todayflag == 1) {
echo "style='background: #dd99ff ;'"; } ?>>
<?php if($flag == 1 or $flag2 == 1) {
echo "<font style='color:#fff;'>".$col."W<font>";
} else {
echo $col."W"; } ?>
</th>
<th <?php if($flag2 == 1){ ?> title="<?php echo $title; ?>" <?php } else if($flag == 1 ){ ?> title="sunday" <?php }?> <th <?php if ($flag2 == 1) { ?> title=" <?php echo $title; ?> "
class="celda_encabezado_general" <?php } else if ($flag == 1) { ?> title="sunday" <?php } ?>
<?php if($flag == 1 or $flag2 == 1) { class="celda_encabezado_general" <?php if ($flag == 1 or $flag2 == 1) {
echo "style='background: #f39c12 ;'"; echo "style='background: #f39c12 ;'";
} else if($todayflag == 1){ } else if ($todayflag == 1) {
echo "style='background: #dd99ff ;'"; }?>> echo "style='background: #dd99ff ;'";
<?php if($flag == 1 or $flag2 == 1){ } ?>>
echo "<font style='color:#fff;'>".$col."OT<font>"; <?php if ($flag == 1 or $flag2 == 1) {
echo "<font style='color:#fff;'>" . $col . "W<font>";
} else { } else {
echo $col."OT"; }?> echo $col . "W";
</th> } ?></th>
<th <?php if ($flag2 == 1) { ?> title=" <?php echo $title; ?> "
<?php } else if ($flag == 1) { ?> title="sunday" <?php } ?>
class="celda_encabezado_general"
<?php if ($flag == 1 or $flag2 == 1) {
echo "style='background: #f39c12 ;'";
} else if ($todayflag == 1) {
echo "style='background: #dd99ff ;'";
} ?>>
<?php if ($flag == 1 or $flag2 == 1) {
echo "<font style='color:#fff;'>" . $col . "OT<font>";
} else {
echo $col . "OT";
} ?>
</th>
<?php <?php
$flag =0; //echo $flag2;
$flag2 =0; $flag = 0;
$flag2 = 0;
$todayflag = 0; $todayflag = 0;
} ?> } ?>
<th class="celda_encabezado_general">Total Hrs</th> <th class="celda_encabezado_general">Total Hrs</th>
@ -307,95 +327,148 @@
<th class="celda_encabezado_general">Days Worked</th> <th class="celda_encabezado_general">Days Worked</th>
<th class="celda_encabezado_general">Absent</th> <th class="celda_encabezado_general">Absent</th>
<th class="celda_encabezado_general">Total Sunday</th> <th class="celda_encabezado_general">Total Sunday</th>
</tr> </tr>
</thead> </thead>
<tbody style="background-color: #fff;"> <tbody style="background-color: #fff;">
<?php $index = 0; <?php $index = 0;
$row=0; $row = 0;
foreach($finalarray as $a){ foreach ($finalarray as $a) {
$row++; $row++;
$index++; $index++; ?>
?>
<tr id="<?php echo $row;?>"> <tr id="<?php echo $row; ?>">
<td width="45" height="45" class="celda_normal"><?php echo $index;?></td> <td width="45" height="45" class="celda_normal"><?php echo $index; ?>
<td width="79" height="45" class="celda_normal"><?php echo $a->EmpID;?></td> </td>
<td width="80" height="45" class="celda_normal"><?php echo $a->FirstName;?></td> <td width="79" height="45" class="celda_normal"><?php echo $a->EmpID; ?>
</td>
<td width="80" height="45" class="celda_normal">
<?php echo $a->FirstName; ?></td>
<?php for ($col =1; $col <= $monthdays;$col++){ <?php for ($col = 1; $col <= $monthdays; $col++) {
$flag = 0; $flag = 0;
$flag2 = 0; $flag2 = 0;
if($col == $currentday) { if ($col == $currentday) {
$todayflag = 1; $todayflag = 1;
} }
foreach($sundayarray as $in) { foreach ($sundayarray as $in) {
if($in == $col) { if ($in == $col) {
$flag = 1; $flag = 1;
} }
} }
foreach($publicholidaysarray as $h) {
foreach ($publicholidaysarray as $h) //For Find out public holidays from $monthdays array
{
$temp = $h->H_Date; $temp = $h->H_Date;
$temp = substr($temp,8); $temp = substr($temp, 8);
$title = ''; $title = '';
if($temp == $col) { //echo $temp.'-'.$col.'/';
if ($temp == $col) {
$flag2 = 1; $flag2 = 1;
$title = str_replace(" ","_",$h->H_Name); //$title ="Public_Holiday-" . str_replace(" ","_",$h->H_Name);
$title = str_replace(" ", "_", $h->H_Name);
//echo $title;
} }
} }
$WH='WH'.$col; $WH = 'WH' . $col;
$OT = 'OT'.$col; $OT = 'OT' . $col;
?> ?>
<td <?php if ($flag2 == 1) { ?> title=" <?php echo $title; ?> "
<td <?php if($flag2 == 1){ ?> title="<?php echo $title; ?>" <?php } else if($flag == 1 ){ ?> title="sunday" <?php }?> <?php } else if ($flag == 1) { ?> title="sunday" <?php } ?>
class="celda_normal" class="celda_normal"
onkeyup="myFunction(this.parentNode.id,this.id,this.textContent);" onkeyup="myFunction(this.parentNode.id,this.id,this.textContent);"
id="<?php echo $row.'row'.$col.'W';?>" id="<?php echo $row . 'row' . $col . 'W'; ?>"
<?php if($flag == 1 or $flag2 == 1){ echo "style='background: #f9cd86 ;'";} else if($todayflag == 1){ echo "style='background: #f7e6ff ;'"; }?> <?php if ($flag == 1 or $flag2 == 1) {
contenteditable="true" tabindex="<?php echo $col;?>"> echo "style='background: #f9cd86 ;'";
<?php if(!empty($a->$WH)){echo $a->$WH;} else { echo '0';}?> } else if ($todayflag == 1) {
</td> echo "style='background: #f7e6ff ;'";
<td <?php if($flag2 == 1){ ?> title="<?php echo $title; ?>" <?php } else if($flag == 1 ){ ?> title="sunday" <?php }?> } ?>
contenteditable="true" tabindex="<?php echo $col; ?>">
<?php if (!empty($a->$WH)) {
echo $a->$WH;
} else {
echo '0';
} ?></td>
<td <?php if ($flag2 == 1) { ?> title=" <?php echo $title; ?> "
<?php } else if ($flag == 1) { ?> title="sunday" <?php } ?>
class="celda_normal" class="celda_normal"
onkeyup="myFunction(this.parentNode.id,this.id,this.textContent);" onkeyup="myFunction(this.parentNode.id,this.id,this.textContent);"
id="<?php echo $row.'row'.$col.'OT';?>" id="<?php echo $row . 'row' . $col . 'OT'; ?>"
<?php if($flag == 1 or $flag2 == 1){ echo "style='background: #f9cd86 ;'";} else if($todayflag == 1){ echo "style='background: #f7e6ff ;'"; }?> <?php if ($flag == 1 or $flag2 == 1) {
contenteditable="true" tabindex="<?php echo $col;?>"> echo "style='background: #f9cd86 ;'";
<?php if(!empty($a->$OT)){echo $a->$OT;} else { echo '0';}?> } else if ($todayflag == 1) {
</td> echo "style='background: #f7e6ff ;'";
} ?>
contenteditable="true" tabindex="<?php echo $col; ?>">
<?php if (!empty($a->$OT)) {
echo $a->$OT;
} else {
echo '0';
} ?></td>
<?php <?php $flag = 0;
$flag =0; $flag2 = 0;
$flag2 =0;
$todayflag = 0; $todayflag = 0;
} ?> } ?>
<td class="celda_normal" id="<?php echo $row.'TH';?>"> <td class="celda_normal" id="<?php echo $row . 'TH'; ?>">
<?php if(!empty($a->Total_WHrs)){echo $a->Total_WHrs;}else{echo "0.00";}?> <?php if (!empty($a->Total_WHrs)) {
echo $a->Total_WHrs;
} else {
echo "0.00";
} ?>
</td> </td>
<td class="celda_normal" id="<?php echo $row.'OTH';?>"> <td class="celda_normal" id="<?php echo $row . 'OTH'; ?>">
<?php if(!empty($a->Total_OTHrs)){echo $a->Total_OTHrs;}else{echo "0.00";}?> <?php if (!empty($a->Total_OTHrs)) {
echo $a->Total_OTHrs;
} else {
echo "0.00";
} ?>
</td> </td>
<td class="celda_normal" id="<?php echo $row.'PL';?>"> <td class="celda_normal" id="<?php echo $row . 'PL'; ?>">
<?php if(!empty($a->Paid_Leave)){echo $a->Paid_Leave;}else{echo "0.00";}?> <?php if (!empty($a->Paid_Leave)) {
echo number_format($a->Paid_Leave, 2, '.', '.');
} else {
echo "0.00";
} ?>
</td> </td>
<td class="celda_normal" id="<?php echo $row.'DW';?>"> <td class="celda_normal" id="<?php echo $row . 'DW'; ?>">
<?php if(!empty($a->DaysWorked)){echo $a->DaysWorked;}else{echo "0.00";}?> <?php if (!empty($a->Days_Worked)) {
echo $a->Days_Worked;
} else {
echo "0.00";
} ?>
</td> </td>
<td class="celda_normal" id="<?php echo $row.'Ab';?>"> <td class="celda_normal" id="<?php echo $row . 'AB'; ?>">
<?php if(!empty($a->Absent)){echo $a->Absent;}else{echo "0.00";}?> <?php if (!empty($a->Absent)) {
echo $a->Absent;
} else {
echo "0.00";
} ?>
</td> </td>
<td class="celda_normal" id="<?php echo $row.'TS';?>"> <td class="celda_normal" id="<?php echo $row . 'TS'; ?>">
<?php if(!empty($a->TotalSunday)){echo $a->TotalSunday;}else{echo "0.00";}?> <?php if (!empty($noofsundays)) {
echo $noofsundays;
} else {
echo "0";
} ?>
</td> </td>
</tr> </tr>
<?php } ?> <?php } ?>
</tbody> </tbody>
</table> </table>
</div><!-- End table-responsive --> </div><!-- End table-responsive -->
<div class="row"> <div class="row">
<div class="col-md-12 text-right"> <div class="col-md-12 text-right">
<input type="button" class="btn btn-success" id="c" value="save" onClick="getAllData();"> <input type="button" class="btn btn-success" id="c" value="save"
onClick="getAllData();">
</div> </div>
</div> </div>
</div> </div>
@ -406,8 +479,10 @@
</div> <!-- End row --> </div> <!-- End row -->
</div> </div>
</div> <!-- End container-fluid --> </div> <!-- End container-fluid -->
</div>
</div> </div>
</div>
@ -415,13 +490,13 @@
<script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script> <script type="text/javascript" src="<?php echo base_url(); ?>public/assets/js/common.js" charset="utf-8"></script>
<script type="text/javascript"> <script type="text/javascript">
$("#month").datepicker({ $("#month").datepicker({
minViewMode: 1, minViewMode: 1,
format: 'M-yyyy' format: 'M-yyyy'
}); });
function getAllData() { function getAllData() {
var s = findInvalidData(); var s = findInvalidData();
@ -429,7 +504,7 @@ function getAllData() {
if (s == 0) { if (s == 0) {
resetFinalValues(); resetFinalValues();
var Totalnoofdays = <?php echo $monthdays?>; var Totalnoofdays = <?php echo $monthdays ?>;
var alldata = $("#attendance").tableToJSON(); var alldata = $("#attendance").tableToJSON();
alldata = JSON.stringify(alldata); alldata = JSON.stringify(alldata);
@ -473,12 +548,12 @@ function getAllData() {
} else { } else {
alert('Plesae Provide Working Hrs and OT Hrs Correctly..!'); alert('Plesae Provide Working Hrs and OT Hrs Correctly..!');
} }
} }
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
$("#attendance").CongelarFilaColumna({ $("#attendance").CongelarFilaColumna({
@ -546,15 +621,18 @@ $(document).ready(function() {
$('#c').show(); $('#c').show();
} }
}); });
</script> </script>
<script> <script>
function myFunction(p, i, v) { function myFunction(p, i, v) {
//alert(p+"-"+i+"-"+v);
//alert(v);
// alert(k.keyCode);
var v = v; var v = v;
var i = i; var i = i;
var id = i.substr(-1); var id = i.substr(-1);
//alert(id);
var len = i.length; var len = i.length;
var nxtid = 0; var nxtid = 0;
var nxtvalue = 0; var nxtvalue = 0;
@ -578,6 +656,12 @@ function myFunction(p, i, v) {
//alert(nxtid);
//console.log(nextid[0].attributes[2].value);
//console.log(nextid);
nxtvalue = v - 8; nxtvalue = v - 8;
curvalue = 8; curvalue = 8;
@ -626,11 +710,11 @@ function myFunction(p, i, v) {
var paidleave = 0; var paidleave = 0;
var totalDaysWorked = 0; var totalDaysWorked = 0;
var absent = 0; var absent = 0;
var sundays = <?php echo $noofsundays?>; var sundays = <?php echo $noofsundays ?>;
var sundaysArray = <?php echo json_encode($sundayarray); ?>; var sundaysArray = <?php echo json_encode($sundayarray); ?>;
var publicholidays = <?php echo $noofpublicholidays?>; var publicholidays = <?php echo $noofpublicholidays ?>;
var totaldays = <?php echo $monthdays?>; var totaldays = <?php echo $monthdays ?>;
totaldays = (totaldays * 2) + 3; totaldays = (totaldays * 2) + 3;
//console.log(totaldays); //console.log(totaldays);
@ -698,6 +782,25 @@ function myFunction(p, i, v) {
}); });
// if(paidleave == 1 )
// {
// absent = 0;
// alert('if');
// }
// if(paidleave == 0)
// {
// absent = 0;
// alert('else if');
// }
// else
// {
// // absent = paidleave-0;
// // paidleave = 0;
// absent = paidleave;
// paidleave = 0;
// alert('else');
// }
TotalOT = totalOTHrs + sundayWorkingHr; TotalOT = totalOTHrs + sundayWorkingHr;
document.getElementById(totalhrsid).textContent = parseFloat(totalworkingHrs).toFixed( document.getElementById(totalhrsid).textContent = parseFloat(totalworkingHrs).toFixed(
2); // == ''?0:parseFloat(totalworkingHrs)); 2); // == ''?0:parseFloat(totalworkingHrs));
@ -706,9 +809,9 @@ function myFunction(p, i, v) {
document.getElementById(paidleaveid).textContent = parseFloat(paidleave).toFixed(2); document.getElementById(paidleaveid).textContent = parseFloat(paidleave).toFixed(2);
document.getElementById(daysworkedid).textContent = parseFloat((totalworkingHrs / 8)).toFixed(2); document.getElementById(daysworkedid).textContent = parseFloat((totalworkingHrs / 8)).toFixed(2);
document.getElementById(absentid).textContent = parseFloat(absent).toFixed(2); document.getElementById(absentid).textContent = parseFloat(absent).toFixed(2);
} }
function findInvalidData() { function findInvalidData() {
var flag = 0; var flag = 0;
//totaldays = (totaldays * 2); //totaldays = (totaldays * 2);
@ -776,16 +879,22 @@ function findInvalidData() {
//for Reset WH, OT, PL, AB to zero if all days entries are zero //for Reset WH, OT, PL, AB to zero if all days entries are zero
//alert('before for'); //alert('before for');
return flag; return flag;
} }
function resetFinalValues() { function resetFinalValues() {
var Row = $('#attendance').find('tr'); var Row = $('#attendance').find('tr');
var totalrowcount = Row.length; var totalrowcount = Row.length;
totalrowcount = totalrowcount - 1; totalrowcount = totalrowcount - 1;
var totaldays = <?php echo $monthdays?>; var totaldays = <?php echo $monthdays ?>;
console.log(totalrowcount); console.log(totalrowcount);
for (i = 1; i <= totalrowcount; i++) { for (i = 1; i <= totalrowcount; i++) {
@ -802,5 +911,5 @@ function resetFinalValues() {
} }
} }
</script> </script>

58
app/Views/companyview.php
View File

@ -462,28 +462,27 @@ function ValidateUA() {
<?php echo session()->getFlashdata('success'); ?> <?php echo session()->getFlashdata('success'); ?>
</div> </div>
<?php } ?> <?php } ?>
<div class="row"> <div class="row" style="margin-bottom: 10px;">
<div class="col-6"> <div class="col-6">
<div class="page-title-box page-title-box-alt"> <div class="page-title-box page-title-box-alt">
<h4 class="page-title">Company Profile</h4> <h4 class="page-title">Company Profile</h4>
</div> </div>
</div> </div>
<div class="col-6 text-right"> <div class="col-6 text-right">
<a class="btn btn-cancel" href="<?php echo base_url(); ?>supplierlisting"><span class="bold">Back</span></a> <a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>supplierlisting"><span class="bold">Back</span></a>
</div> </div>
</div> </div>
<!-- end page title --> <!-- end page title -->
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body" style="padding: 1rem 2rem !important;">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="p-2">
<form class="form-horizontal" role="form" id="addemployee" action="<?php echo base_url() ?>Updatecompany" method="post" role="form" enctype="multipart/form-data"> <form class="form-horizontal" role="form" id="addemployee" action="<?php echo base_url() ?>Updatecompany" method="post" role="form" enctype="multipart/form-data">
<div class="box-body"> <div class="box-body">
<!-- Supplier Information --> <!-- Supplier Information -->
<legend style="margin-left:-10px">Company Information</legend> <legend style="margin-left:-10px;color: #4f7c97;;color: #4f7c97;">Company Information</legend>
<div class="col-md-12" style="margin-bottom: 27px;"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="form-row"> <div class="form-row">
<div class=" col-md-3"> <div class=" col-md-3">
@ -538,18 +537,18 @@ function ValidateUA() {
</div> </div>
<!-- Address Section --> <!-- Address Section -->
<legend style="margin-left:-10px">Address Details</legend> <legend style="margin-left:-10px;color: #4f7c97;">Address Details</legend>
<div class="col-md-12" style="margin-bottom: 27px;"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="form-row"> <div class="form-row">
<div class=" col-md-12"> <div class=" col-md-6">
<label class="col-form-label" for="Address">Address<span class="badge">*</span></label> <label class="col-form-label" for="Address">Address<span class="badge">*</span></label>
<input type="text" id="Address" name="Address" maxlength="500" class="form-control" value="<?php echo $Address;?>" required> <textarea id="Address" name="Address" maxlength="500" class="form-control" rows="3" required><?php echo $Address;?></textarea>
</div> </div>
</div> </div>
</div> </div>
<!-- Tax Related Data --> <!-- Tax Related Data -->
<legend style="margin-left:-10px">Tax Related Data</legend> <legend style="margin-left:-10px;color: #4f7c97;">Tax Related Data</legend>
<!-- Text input--> <!-- Text input-->
<div class="col-md-12" style="margin-bottom: 27px;"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="form-row" style="margin-bottom: 20px;"> <div class="form-row" style="margin-bottom: 20px;">
@ -576,10 +575,10 @@ function ValidateUA() {
</div> </div>
<!-- Bank Details--> <!-- Bank Details-->
<legend style="margin-left:-10px">ID Proof</legend> <legend style="margin-left:-10px;color: #4f7c97;">ID Proof</legend>
<div class="col-md-12" style="margin-bottom: 27px;"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="form-row"> <div class="form-row" style="margin-bottom: 20px;">
<div class=" col-md-4"> <div class=" col-md-4">
<label class="col-form-label" for="UANumber">UA Number<span class="badge">*</span></label> <label class="col-form-label" for="UANumber">UA Number<span class="badge">*</span></label>
<input type="text" id="UANumber" name="UANumber" onchange="ValidateUA();" maxlength="15" class="form-control" value="<?php echo $UANumber;?>" pattern="([a-zA-Z]){5}([0-9]){10}" style="text-transform: uppercase"> </div> <input type="text" id="UANumber" name="UANumber" onchange="ValidateUA();" maxlength="15" class="form-control" value="<?php echo $UANumber;?>" pattern="([a-zA-Z]){5}([0-9]){10}" style="text-transform: uppercase"> </div>
@ -597,18 +596,23 @@ function ValidateUA() {
</div> </div>
<div class=" col-md-4"> <div class=" col-md-4">
<label class="col-form-label" for="GSTNumber">GST Number<span class="badge">*</span></label> <label class="col-form-label" for="GSTNumber">GST Number<span class="badge">*</span></label>
<input type="text" id="GSTNO" maxlength="15" onchange="validateGST();" name="GSTNO" class="form-control" style="text-transform: uppercase" value="<?php echo $GSTNO;?>" pattern="([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}" required title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and should be 'Z' only and 1 Number"> </div> <input type="text" id="GSTNO" maxlength="15" onchange="validateGST();" name="GSTNO" class="form-control" style="text-transform: uppercase" value="<?php echo $GSTNO;?>" pattern="([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}" required title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and should be 'Z' only and 1 Number">
</div>
<div class=" col-md-4"> <div class=" col-md-4">
<label class="col-form-label" for="PANNumber">PAN Number<span class="badge">*</span></label> <label class="col-form-label" for="PANNumber">PAN Number<span class="badge">*</span></label>
<input type="text" id="PAN" maxlength="10" name="PAN" onchange="validatePAN();" class="form-control" style="text-transform: uppercase" value="<?php echo $PAN;?>" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" required> </div> <input type="text" id="PAN" maxlength="10" name="PAN" onchange="validatePAN();" class="form-control" style="text-transform: uppercase" value="<?php echo $PAN;?>" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" required>
</div>
<div class=" col-md-4"> <div class=" col-md-4">
<label class="col-form-label" for="CollectrateAddress">Collectrate Address<span class="badge">*</span></label> <label class="col-form-label" for="CollectrateAddress">Collectrate Address<span class="badge">*</span></label>
<input type="text" id="CollectrateAddress" required name="CollectrateAddress" maxlength="500" class="form-control" value="<?php echo $CollectrateAddress;?>" required > </div> <input type="text" id="CollectrateAddress" required name="CollectrateAddress" maxlength="500" class="form-control" value="<?php echo $CollectrateAddress;?>" required >
</div>
</div>
</div> </div>
<legend style="margin-left:-10px">Bank Details</legend>
<!-- Text input-->
<legend style="margin-left:-10px;color: #4f7c97;">Bank Details</legend>
<div class="col-md-12" style="margin-bottom: 27px;">
<!-- Text input-->
<div class="form-row" style="margin-bottom: 27px;"> <div class="form-row" style="margin-bottom: 27px;">
<div class="col-md-3"> <div class="col-md-3">
<span for="BankName">Bank Name</span> <span for="BankName">Bank Name</span>
@ -626,12 +630,12 @@ function ValidateUA() {
</div> </div>
</div> </div>
<input type="hidden" id="BankState" name="BankState" class="form-control" value="Yes"> <input type="hidden" id="BankState" name="BankState" class="form-control" value="Yes">
<div class="form-row" style="padding: 19px;"> <div class="form-row" >
<div class="col-md-12 text-right"> <div class="col-md-12 text-right">
<a class="btn btn-success font Add" ID="Add"> &nbsp;&nbsp;<span class="bold">Add/Update Bank Detail</span></a>&nbsp;&nbsp;&nbsp;&nbsp; <a class="btn btn-success font Add" ID="Add"> &nbsp;&nbsp;<span class="bold">Add/Update Bank Detail</span></a>&nbsp;&nbsp;&nbsp;&nbsp;
</div> </div>
</div> </div>
<div class="form-row" style="padding: 19px;"> <div class="form-row" >
<div class="col-md-12"> <div class="col-md-12">
<table id="banktable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" > <table id="banktable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" >
<thead > <thead >
@ -670,8 +674,11 @@ function ValidateUA() {
</table> </table>
</div> </div>
</div> </div>
<legend style="margin-left:-10px">Upload File</legend> </div>
<div class="form-row" style="padding: 19px;">
<legend style="margin-left:0px;color: #4f7c97;">Upload File</legend>
<div class="col-md-12" style="margin-bottom: 27px;">
<div class="form-row" >
<div class="col-md-4"> <div class="col-md-4">
<span for="FileDescription">File Description</span> <span for="FileDescription">File Description</span>
<select class="form-control required" id="filedescription" name="filedescription"> <select class="form-control required" id="filedescription" name="filedescription">
@ -690,16 +697,17 @@ function ValidateUA() {
</select> </select>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
<input type = "file" size = "20" input accept=".docx,.pdf,.doc.JPG,.PNG" onchange="readURL(this,1);" id="images" name="images"/> <label style="margin-bottom:0px !important;" for="images">Select Company file<small> (only .pdf,.excel,.doc,.png,.jpg)</small></label>
<label for="images">Select Company file<br/><small>(only .pdf,.excel,.doc,.png,.jpg)</small></label> <input style="margin-top: 5px;" type = "file" size = "20" input accept=".docx,.pdf,.doc.JPG,.PNG" onchange="readURL(this,1);" id="images" name="images"/>
</div> </div>
</div> </div>
<div class="form-row" style="padding: 19px;"> <div class="form-row" >
<div class="col-md-12 text-right"> <div class="col-md-12 text-right">
<input type="submit" id="submit" onclick="valid();" class="btn btn-success" value="Submit" /> <input type="submit" id="submit" onclick="valid();" class="btn btn-success" value="Submit" />
</div> </div>
</div> </div>
<div class="form-row"style="padding: 19px;"> <div class="form-row">
<div class="col-md-12"> <div class="col-md-12">
<table id="datatable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" > <table id="datatable" class="table table-hover table-bordered" style="background-color:#fff;font-size:12px;" >
<thead > <thead >
@ -742,6 +750,7 @@ function ValidateUA() {
</table> </table>
</div> </div>
</div> </div>
</div>
<div class="col-md-12 text-right"> <div class="col-md-12 text-right">
<input type="reset" id="reset" class="btn btn-reset" style="background-color: red;color: white; margin-right: 15px;width: 80px;" value="Reset" /> <input type="reset" id="reset" class="btn btn-reset" style="background-color: red;color: white; margin-right: 15px;width: 80px;" value="Reset" />
<input type="submit" onclick="return Validate();" value="Submit" class="btn btn-success"> <input type="submit" onclick="return Validate();" value="Submit" class="btn btn-success">
@ -750,7 +759,6 @@ function ValidateUA() {
</form> </form>
</div> </div>
</div> </div>
</div>
<!-- end row --> <!-- end row -->
</div> </div>
</div> <!-- end card --> </div> <!-- end card -->

4
app/Views/editOld.php
View File

@ -43,14 +43,14 @@ if(!empty($EmpList))
<!-- Start Content--> <!-- Start Content-->
<div class="container-fluid"> <div class="container-fluid">
<!-- start page title --> <!-- start page title -->
<div class="row"> <div class="row" style="margin-bottom: 10px;">
<div class="col-6"> <div class="col-6">
<div class="page-title-box page-title-box-alt"> <div class="page-title-box page-title-box-alt">
<h4 class="page-title">Edit User <?= ' - '.$EmpId; ?> Details</h4> <h4 class="page-title">Edit User <?= ' - '.$EmpId; ?> Details</h4>
</div> </div>
</div> </div>
<div class="col-6 text-right"> <div class="col-6 text-right">
<a class="btn btn-cancel" href="<?php echo base_url(); ?>userListing">&nbsp;&nbsp;<span class="bold">Back</span></a> <a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>userListing"><span class="bold">Back</span></a>
</div> </div>
</div> </div>
<!-- end page title --> <!-- end page title -->

6
app/Views/editOldasset.php
View File

@ -144,14 +144,14 @@ if (!empty($assetList)) {
<div class="content-page"> <div class="content-page">
<div class="content"> <div class="content">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row" style="margin-bottom: 10px;">
<div class="col-6"> <div class="col-6">
<div class="page-title-box page-title-box-alt"> <div class="page-title-box page-title-box-alt">
<h4 class="page-title">Edit Asset Details - <?php echo $AssetCode; ?></h4> <h4 class="page-title">Edit Asset Details - <?php echo $AssetCode; ?></h4>
</div> </div>
</div> </div>
<div class="col-6 text-right"> <div class="col-6 text-right">
<a class="btn btn-cancel" href="<?php echo base_url(); ?>assetListing"><span class="bold">Back</span></a> <a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>assetListing"><span class="bold">Back</span></a>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@ -255,7 +255,7 @@ if (!empty($assetList)) {
<label for="Remarks">Remarks</label> <label for="Remarks">Remarks</label>
<input type="text" class="form-control" id="Remarks" name="Remarks" value="<?php echo $Remarks; ?>" maxlength="500"> <input type="text" class="form-control" id="Remarks" name="Remarks" value="<?php echo $Remarks; ?>" maxlength="500">
</div> </div>
<div class="col-md-3"> <div class="col-md-3 d-flex align-items-center">
<div class="form-check"> <div class="form-check">
<input type="checkbox" class="form-check-input" id="isactive" name="isactive" <?php echo $IsActive ? 'checked' : ''; ?>> <input type="checkbox" class="form-check-input" id="isactive" name="isactive" <?php echo $IsActive ? 'checked' : ''; ?>>
<label class="form-check-label" for="isactive">Is Active</label> <label class="form-check-label" for="isactive">Is Active</label>

6
app/Views/editRawmaterial.php
View File

@ -107,16 +107,14 @@ if ($total <= $reorder) {
<!-- Start Content--> <!-- Start Content-->
<div class="container-fluid"> <div class="container-fluid">
<!-- Start page title --> <!-- Start page title -->
<div class="row"> <div class="row" style="margin-bottom: 10px;">
<div class="col-6"> <div class="col-6">
<div class="page-title-box page-title-box-alt"> <div class="page-title-box page-title-box-alt">
<h4 class="page-title">Edit Material - <?php echo $MaterialCode; ?> Details</h4> <h4 class="page-title">Edit Material - <?php echo $MaterialCode; ?> Details</h4>
</div> </div>
</div> </div>
<div class="col-6 text-right"> <div class="col-6 text-right">
<a class="btn btn-cancel" href="<?php echo base_url(); ?>rawmaterialListing"> <a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>rawmaterialListing"><span class="bold">Back</span></a>
<span class="bold">Back</span>
</a>
</div> </div>
</div> </div>
<!-- End page title --> <!-- End page title -->

83
app/Views/editSupplier.php
View File

@ -280,34 +280,39 @@ if (!empty($supplier)) {
<!-- form start --> <!-- form start -->
</div> </div>
<!-- start page title --> <!-- start page title -->
<div class="row"> <div class="row" style="margin-bottom: 10px;">
<div class="col-6"> <div class="col-6">
<div class="page-title-box page-title-box-alt"> <div class="page-title-box page-title-box-alt">
<h4 class="page-title">Edit Supplier Details</h4> <h4 class="page-title">Edit Supplier Details</h4>
</div> </div>
</div> </div>
<div class="col-6 text-right"> <div class="col-6 text-right">
<a class="btn btn-cancel" href="<?php echo base_url(); ?>supplierlisting"><span class="bold">Back</span></a>
<a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>supplierlisting"><span class="bold">Back</span></a>
</div> </div>
</div> </div>
<!-- end page title --> <!-- end page title -->
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body" style="padding: 1rem 2rem !important;">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="p-2">
<form class="form-horizontal" role="form" id="UpdateSupplier" action="<?php echo base_url() ?>editsupplier" method="post" enctype="multipart/form-data"> <form class="form-horizontal" role="form" id="UpdateSupplier" action="<?php echo base_url() ?>editsupplier" method="post" enctype="multipart/form-data">
<div class="box-body"> <div class="box-body">
<?php if ((int)$chk) { ?> <?php if ((int)$chk) { ?>
<div class="col-md-12 text-right"> <div class="row">
<div class="col-md-6 text-left">
<legend style="margin-left:-10px;color: #4f7c97;">Supplier Information</legend>
</div>
<div class="col-md-6 text-right">
<input type="checkbox" id="isactive" <?php echo $IsActive; ?> name="isactive"> IsActive <input type="checkbox" id="isactive" <?php echo $IsActive; ?> name="isactive"> IsActive
</div> </div>
</div>
<?php } ?> <?php } ?>
<!-- Supplier Information --> <!-- Supplier Information -->
<legend>Supplier Information</legend> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="form-row"> <div class="form-row" style="margin-bottom:10px;">
<div class="col-md-3"> <div class="col-md-3">
<label class="col-form-label" for="SupplierName">Supplier Name<span class="badge">*</span></label> <label class="col-form-label" for="SupplierName">Supplier Name<span class="badge">*</span></label>
<input type="text" name="SupplierName" maxlength="100" id="supplierName" class="form-control" required value="<?php echo $SupplierName; ?>"> <input type="text" name="SupplierName" maxlength="100" id="supplierName" class="form-control" required value="<?php echo $SupplierName; ?>">
@ -326,33 +331,37 @@ if (!empty($supplier)) {
</div> </div>
</div> </div>
<div class="form-row" style="margin-top:20px;"> <div class="form-row">
<div class="col-md-12"> <div class="col-md-12" style="margin-top:5px">
<label for="SupplierType">Supplier Type</label> <label for="SupplierType">Supplier Type</label>
</div> </div>
<div class="col-md-3"> <div class="col-md-1" style="margin-top:5px">
<input type="checkbox" id="service" <?php echo $IsService; ?> name="service" value="1"> <b>SERVICE</b> <input type="checkbox" id="service" <?php echo $IsService; ?> name="service" value="1"> <b>SERVICE</b>
</div> </div>
<div class="col-md-3"> <div class="col-md-1.5" style="margin-top:5px">
<input type="checkbox" id="rawmaterial" <?php echo $IsRawMaterial; ?> name="rawmaterial" value="1"> <b>RAW MATERIALS</b> <input type="checkbox" id="rawmaterial" <?php echo $IsRawMaterial; ?> name="rawmaterial" value="1"> <b>RAW MATERIALS</b>
</div> </div>
<div class="col-md-3"> <div class="col-md-2" style="margin-top:5px">
<input type="checkbox" id="maintanance" <?php echo $IsMaintanance; ?> name="maintanance" value="1"> <b>MAINTENANCE</b> <input type="checkbox" id="maintanance" <?php echo $IsMaintanance; ?> name="maintanance" value="1"> <b>MAINTENANCE</b>
</div> </div>
</div> </div>
</div>
<!-- Address Section --> <!-- Address Section -->
<legend style="margin-top:30px;">Address Details</legend> <legend style="margin-left:-10px;color: #4f7c97;">Address Details</legend>
<div class="col-md-12" style="margin-bottom: 27px;">
<div class="form-row"> <div class="form-row">
<div class="col-md-12"> <div class="col-md-6">
<label for="Address2">Address<span class="badge">*</span></label> <label for="Address2">Address<span class="badge">*</span></label>
<input type="text" class="form-control" id="Address" name="Address" maxlength="500" required value="<?php echo $Address; ?>"> <textarea type="text" class="form-control" id="Address" name="Address" maxlength="500" required rows="3"><?php echo $Address; ?></textarea>
</div>
</div> </div>
</div> </div>
<!-- Tax Related Data --> <!-- Tax Related Data -->
<legend style="margin-top:30px;">Tax Related Data</legend> <legend style="margin-left:-10px;color: #4f7c97;">Tax Related Data</legend>
<div class="form-row"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="form-row" style="margin-bottom: 20px;">
<div class="col-md-3"> <div class="col-md-3">
<label for="GSTNo">GST Number</label> <label for="GSTNo">GST Number</label>
<input type="text" id="GSTNo" name="GSTNo" onchange="validateGST();" maxlength="15" class="form-control" value="<?php echo $GSTNO; ?>" pattern="([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}" style="text-transform:uppercase;" title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' Character and 1 Number (or) Character " onkeypress="return alphaNumberic(event)"> <input type="text" id="GSTNo" name="GSTNo" onchange="validateGST();" maxlength="15" class="form-control" value="<?php echo $GSTNO; ?>" pattern="([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}" style="text-transform:uppercase;" title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' Character and 1 Number (or) Character " onkeypress="return alphaNumberic(event)">
@ -362,8 +371,8 @@ if (!empty($supplier)) {
<input type="text" id="panno" maxlength="10" name="panno" onchange="validatePAN();" class="form-control" value="<?php echo $PAN; ?>" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character must be in caps format)" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" onkeypress="return alphaNumberic(event)" style="text-transform:uppercase;"> <input type="text" id="panno" maxlength="10" name="panno" onchange="validatePAN();" class="form-control" value="<?php echo $PAN; ?>" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character must be in caps format)" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" onkeypress="return alphaNumberic(event)" style="text-transform:uppercase;">
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<label style="margin-bottom: 1px !important;" for="Cert_GST">Select GST Document<br /><small>(only .pdf, .doc, .png, .jpg)</small></label>
<input type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_GST" name="Cert_GST" /> <input type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_GST" name="Cert_GST" />
<label for="Cert_GST">Select GST Document<br /><small>(only .pdf, .doc, .png, .jpg)</small></label>
<input type="hidden" id="hidden_Cert_GST" name="hidden_Cert_GST" value="<?php echo $hidden_Cert_GST; ?>" /> <input type="hidden" id="hidden_Cert_GST" name="hidden_Cert_GST" value="<?php echo $hidden_Cert_GST; ?>" />
</div> </div>
<?php if ($hidden_Cert_GST) { ?> <?php if ($hidden_Cert_GST) { ?>
@ -372,38 +381,39 @@ if (!empty($supplier)) {
</div> </div>
<?php } ?> <?php } ?>
</div> </div>
</div>
<legend>Bank Details</legend> <legend style="margin-left:-10px;color: #4f7c97;">Bank Details</legend>
<!-- Bank Details Inputs --> <!-- Bank Details Inputs -->
<div class="form-row" style="margin-bottom: 27px;"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="col-md-3"> <div class="form-row" style="margin-bottom: 20px;">
<div class="col-md-4">
<label for="accno">Account Number <span class="badge">*</span></label> <label for="accno">Account Number <span class="badge">*</span></label>
<input type="text" id="accno" maxlength="20" name="accno" value="<?php echo $accno; ?>" class="form-control" onkeypress="return isNumberKey(event)" required> <input type="text" id="accno" maxlength="20" name="accno" value="<?php echo $accno; ?>" class="form-control" onkeypress="return isNumberKey(event)" required>
</div> </div>
<div class="col-md-3"> <div class="col-md-4">
<label for="ifsc">IFSC Code <span class="badge">*</span></label> <label for="ifsc">IFSC Code <span class="badge">*</span></label>
<input type="text" id="ifsc" name="ifsc" value="<?php echo $IFSCCode; ?>" class="form-control" maxlength="12" style="text-transform: uppercase" required> <input type="text" id="ifsc" name="ifsc" value="<?php echo $IFSCCode; ?>" class="form-control" maxlength="12" style="text-transform: uppercase" required>
</div> </div>
<div class="col-md-3"> <div class="col-md-4">
<label for="branchname">Bank Branch Name</label> <label for="branchname">Bank Branch Name</label>
<input type="text" id="branchname" name="branchname" value="<?php echo $branchname; ?>" class="form-control" maxlength="200"> <input type="text" id="branchname" name="branchname" value="<?php echo $branchname; ?>" class="form-control" maxlength="200">
</div> </div>
<div class="col-md-3"> </div>
<!-- Bank Document Upload -->
<div class="form-row" style="margin-bottom: 27px;">
<div class="col-md-4">
<label for="bankaddress">Bank Address</label> <label for="bankaddress">Bank Address</label>
<input type="text" id="bankaddress" name="bankaddress" value="<?php echo $bankaddress; ?>" class="form-control" maxlength="200"> <input type="text" id="bankaddress" name="bankaddress" value="<?php echo $bankaddress; ?>" class="form-control" maxlength="200">
</div> </div>
</div> <div class="col-md-4">
<label class="col-form-label" for="Cert_BANK">Select Bank Document<small> (only .pdf, .doc, .png, .jpg)</small></label>
<!-- Bank Document Upload -->
<div class="form-row" style="margin-bottom: 27px;">
<div class="col-md-3">
<input type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_BANK" name="Cert_BANK" /> <input type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_BANK" name="Cert_BANK" />
<label for="Cert_BANK">Select Bank Document<br /><small>(only .pdf, .doc, .png, .jpg)</small></label>
<input type="hidden" id="hidden_Cert_BANK" name="hidden_Cert_BANK" value="<?php echo $hidden_Cert_BANK; ?>" /> <input type="hidden" id="hidden_Cert_BANK" name="hidden_Cert_BANK" value="<?php echo $hidden_Cert_BANK; ?>" />
</div> </div>
<?php if ($hidden_Cert_BANK) { ?> <?php if ($hidden_Cert_BANK) { ?>
<div class="col-md-3"> <div class="col-md-4">
<u> <u>
<a title="Previously uploaded Bank Document" href="<?php echo base_url() . 'public/uploads/images/' . $hidden_Cert_BANK ?>"> <a title="Previously uploaded Bank Document" href="<?php echo base_url() . 'public/uploads/images/' . $hidden_Cert_BANK ?>">
<span>Previously uploaded BANK Document - </span> <span>Previously uploaded BANK Document - </span>
@ -413,14 +423,15 @@ if (!empty($supplier)) {
</div> </div>
<?php } ?> <?php } ?>
</div> </div>
</div>
<!-- Payment Details --> <!-- Payment Details -->
<legend>Payment Details</legend> <legend style="margin-left:-10px;color: #4f7c97;">Payment Details</legend>
<!-- Payable Terms Selection --> <!-- Payable Terms Selection -->
<div class="form-row" style="margin-bottom: 27px;"> <div class="col-md-12" style="margin-bottom: 27px;">
<div class="col-md-3"> <div class="form-row" style="margin-bottom: 20px;">
<div class="col-md-4">
<label for="payablefrom">Payable Terms</label> <label for="payablefrom">Payable Terms</label>
<select class="form-control required select2" id="PaymentTerms" name="PaymentTerms" onchange="payment_hidden();"> <select class="form-control required select2" id="PaymentTerms" name="PaymentTerms" onchange="payment_hidden();">
<option value="<?php echo $PaymentTerms; ?>"><?php echo $PaymentTerms; ?></option> <option value="<?php echo $PaymentTerms; ?>"><?php echo $PaymentTerms; ?></option>
@ -438,6 +449,7 @@ if (!empty($supplier)) {
<!-- <input type="hidden" id="paymentname" name="paymentname" value="<?php echo $PaymentId; ?>"> --> <!-- <input type="hidden" id="paymentname" name="paymentname" value="<?php echo $PaymentId; ?>"> -->
</div> </div>
</div> </div>
</div>
<br /> <br />
@ -451,7 +463,6 @@ if (!empty($supplier)) {
<!-- /.box-footer --> <!-- /.box-footer -->
</div> </div>
</form> </form>
</div> <!-- end p-2 -->
</div> <!-- end col --> </div> <!-- end col -->
</div> <!-- end row --> </div> <!-- end row -->
</div> <!-- end card-body --> </div> <!-- end card-body -->

26
app/Views/editconfig.php
View File

@ -24,14 +24,14 @@ if (!empty($master)) {
<!-- Start Content--> <!-- Start Content-->
<div class="container-fluid"> <div class="container-fluid">
<!-- start page title --> <!-- start page title -->
<div class="row"> <div class="row" style="margin-bottom: 10px;">
<div class="col-6"> <div class="col-6">
<div class="page-title-box page-title-box-alt"> <div class="page-title-box page-title-box-alt">
<h4 class="page-title">Edit Config <?= ' - ' . $ConfigName; ?> Details</h4> <h4 class="page-title">Edit Config <?= ' - ' . $ConfigName; ?> Details</h4>
</div> </div>
</div> </div>
<div class="col-6 text-right"> <div class="col-6 text-right">
<a class="btn btn-cancel" href="<?php echo base_url(); ?>configlisting"><span class="bold">Back</span></a> <a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>configlisting"><span class="bold">Back</span></a>
</div> </div>
</div> </div>
@ -148,13 +148,9 @@ if (!empty($master)) {
<div class="modal-content"> <div class="modal-content">
<!-- Modal Header --> <!-- Modal Header -->
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal"> <h4 class="modal-title" id="myModalLabel">Add Configuration</h4>
<span aria-hidden="true">&times;</span> <button type="button" class="close" data-dismiss="modal"
<span class="sr-only">Close</span> aria-hidden="true">×</button>
</button>
<h4 class="modal-title" id="myModalLabel">
<center> Add Configuration</center>
</h4>
</div> </div>
<!-- Modal Body --> <!-- Modal Body -->
@ -162,7 +158,7 @@ if (!empty($master)) {
<form class="form-horizontal" role="form"> <form class="form-horizontal" role="form">
<div class="form-group"> <div class="form-group">
<div class="row"> <div class="row">
<div class="col-md-3 col-md-offset-2"> <div class="col-md-4">
Configuration Value : Configuration Value :
</div> </div>
<div class="col-md-5"> <div class="col-md-5">
@ -188,13 +184,9 @@ if (!empty($master)) {
<div class="modal-content"> <div class="modal-content">
<!-- Modal Header --> <!-- Modal Header -->
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal"> <h4 class="modal-title" id="myModalLabel">Edit Config</h4>
<span aria-hidden="true">&times;</span> <button type="button" class="close" data-dismiss="modal"
<span class="sr-only">Close</span> aria-hidden="true">×</button>
</button>
<h4 class="modal-title" id="myModalLabel">
<center> Edit Config</center>
</h4>
</div> </div>
<!-- Modal Body --> <!-- Modal Body -->

13
app/Views/editdepartment.php
View File

@ -99,21 +99,21 @@ if(!empty($department))
<!-- Start Content--> <!-- Start Content-->
<div class="container-fluid"> <div class="container-fluid">
<!-- start page title --> <!-- start page title -->
<div class="row"> <div class="row" style="margin-bottom: 10px;">
<div class="col-6"> <div class="col-6">
<div class="page-title-box page-title-box-alt"> <div class="page-title-box page-title-box-alt">
<h4 class="page-title">Edit Department - <?php echo $DepartmentName; ?> Details</h4> <h4 class="page-title">Edit Department - <?php echo $DepartmentName; ?> Details</h4>
</div> </div>
</div> </div>
<div class="col-6 text-right"> <div class="col-6 text-right">
<a class="btn btn-cancel" href="<?php echo base_url(); ?>departmentListing">&nbsp;&nbsp;<span class="bold">Back</span></a> <a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>departmentListing"><span class="bold">Back</span></a>
</div> </div>
</div> </div>
<!-- end page title --> <!-- end page title -->
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body" style="padding: 1rem 2rem !important;">
<form role="form" id="Updatedepartment" action="<?php echo base_url() ?>editdepartment" method="post"> <form role="form" id="Updatedepartment" action="<?php echo base_url() ?>editdepartment" method="post">
<div class="box-body"> <div class="box-body">
<!-- Department Information --> <!-- Department Information -->
@ -123,14 +123,10 @@ if(!empty($department))
<label class="col-form-label" for="DEPCode">Department Code</label> <label class="col-form-label" for="DEPCode">Department Code</label>
<input type="text" name="DEPCode" id="DEPCode" class="form-control" readonly value="<?php echo $DEPCode; ?>"> <input type="text" name="DEPCode" id="DEPCode" class="form-control" readonly value="<?php echo $DEPCode; ?>">
</div> </div>
</div>
<div class="form-row" style="margin-top:10px">
<div class="col-md-3"> <div class="col-md-3">
<label class="col-form-label" for="DepartmentName">Department Name<span class="badge">*</span></label> <label class="col-form-label" for="DepartmentName">Department Name<span class="badge">*</span></label>
<input type="text" name="DepartmentName" id="DepartmentName" class="form-control" required value="<?php echo $DepartmentName; ?>"> <input type="text" name="DepartmentName" id="DepartmentName" class="form-control" required value="<?php echo $DepartmentName; ?>">
</div> </div>
</div>
<div class="form-row" style="margin-top:10px">
<div class="col-md-3"> <div class="col-md-3">
<label class="col-form-label" for="HeadDept">Head Department</label> <label class="col-form-label" for="HeadDept">Head Department</label>
<select class="form-control required" id="HeadDept" name="HeadDept"> <select class="form-control required" id="HeadDept" name="HeadDept">
@ -142,9 +138,6 @@ if(!empty($department))
} ?> } ?>
</select> </select>
</div> </div>
</div>
<div class="form-row" style="margin-top:10px">
<div class="col-md-2"> <div class="col-md-2">
<label class="col-form-label" for="IsActive">Is Active</label><br> <label class="col-form-label" for="IsActive">Is Active</label><br>
<input type="checkbox" id="IsActive" name="IsActive" <?php echo $IsActive; ?>> <input type="checkbox" id="IsActive" name="IsActive" <?php echo $IsActive; ?>>

2
app/Views/supplierListing.php
View File

@ -64,7 +64,7 @@
</div> </div>
</div> </div>
<div class="col-6 text-right"> <div class="col-6 text-right">
<div class="form-group"> <div class="form-group" style="margin-bottom:0px !important;">
<a class="btn btn-success" href="<?php echo base_url(); ?>addsupplier">Add New Supplier</a> <a class="btn btn-success" href="<?php echo base_url(); ?>addsupplier">Add New Supplier</a>
<!-- <a class="btn btn-success" href="<?php echo base_url(); ?>exportsupplier">Export Supplier Details <i class="fa fa-download" aira-hidden="true"></i></a> --> <!-- <a class="btn btn-success" href="<?php echo base_url(); ?>exportsupplier">Export Supplier Details <i class="fa fa-download" aira-hidden="true"></i></a> -->
</div> </div>

2
public/new_assets/css/app-creative-dark-rtl.css
View File

@ -848,7 +848,7 @@ body[data-layout-mode="detached"] .navbar-custom {
.page-title-box-alt { .page-title-box-alt {
background-color: transparent; background-color: transparent;
padding: 24px 27px; padding: 10px 27px;
box-shadow: none; box-shadow: none;
margin-bottom: 0; } margin-bottom: 0; }

2
public/new_assets/css/app-creative-dark-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/new_assets/css/app-creative-dark-rtl.min.css.map
View File

File diff suppressed because one or more lines are too long

2
public/new_assets/css/app-creative-dark.css
View File

@ -848,7 +848,7 @@ body[data-layout-mode="detached"] .navbar-custom {
.page-title-box-alt { .page-title-box-alt {
background-color: transparent; background-color: transparent;
padding: 24px 27px; padding: 10px 27px;
box-shadow: none; box-shadow: none;
margin-bottom: 0; } margin-bottom: 0; }

2
public/new_assets/css/app-creative-dark.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/new_assets/css/app-creative-dark.min.css.map
View File

File diff suppressed because one or more lines are too long

2
public/new_assets/css/app-creative-rtl.css
View File

@ -848,7 +848,7 @@ body[data-layout-mode="detached"] .navbar-custom {
.page-title-box-alt { .page-title-box-alt {
background-color: transparent; background-color: transparent;
padding: 24px 27px; padding: 10px 27px;
box-shadow: none; box-shadow: none;
margin-bottom: 0; } margin-bottom: 0; }

2
public/new_assets/css/app-creative-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/new_assets/css/app-creative-rtl.min.css.map
View File

File diff suppressed because one or more lines are too long

2
public/new_assets/css/app-creative.css
View File

@ -848,7 +848,7 @@ body[data-layout-mode="detached"] .navbar-custom {
.page-title-box-alt { .page-title-box-alt {
background-color: transparent; background-color: transparent;
padding: 24px 27px; padding: 10px 27px;
box-shadow: none; box-shadow: none;
margin-bottom: 0; } margin-bottom: 0; }

2
public/new_assets/css/app-creative.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
public/new_assets/css/app-creative.min.css.map
View File

File diff suppressed because one or more lines are too long