Merge branch 'CI4-Application' of bitbucket.org:venbainformationtechnology/ria into CI4-Application
This commit is contained in:
commit
84cf062161
@ -457,24 +457,26 @@ legend {
|
|||||||
|
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
|
|
||||||
<div class="col-md-12 pad">
|
<div class="col-md-6 pad">
|
||||||
<span>Full Name</span><span class="badge">*</span>
|
<span>Full Name</span><span class="badge">*</span>
|
||||||
<input type="text" name="FirstName"
|
<input type="text" name="FirstName"
|
||||||
onkeypress="return onlyAlphabets(event);" maxlength="100"
|
onkeypress="return onlyAlphabets(event);" maxlength="100"
|
||||||
id="FirstName" class="form-control" required>
|
id="FirstName" class="form-control" required>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="col-md-6 pad"><span>Father / Husband Name</span><span
|
||||||
|
class="badge">*</span>
|
||||||
|
<input type="text" name="FatherName"
|
||||||
|
onkeypress="return onlyAlphabets(event);" id="FatherName"
|
||||||
|
maxlength="200" class="form-control" required>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- <div class="col-md-6 pad"><span>Last Name</span><span class="badge">*</span>
|
<!-- <div class="col-md-6 pad"><span>Last Name</span><span class="badge">*</span>
|
||||||
<input type="text" name="LastName" onkeypress="return onlyAlphabets(event);" maxlength="100" id="LastName" class="form-control" required>
|
<input type="text" name="LastName" onkeypress="return onlyAlphabets(event);" maxlength="100" id="LastName" class="form-control" required>
|
||||||
</div> -->
|
</div> -->
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div class="col-md-6 pad"><span>Father / Husband Name</span><span
|
|
||||||
class="badge">*</span>
|
|
||||||
<input type="text" name="FatherName"
|
|
||||||
onkeypress="return onlyAlphabets(event);" id="FatherName"
|
|
||||||
maxlength="200" class="form-control" required>
|
|
||||||
</div>
|
|
||||||
<div class="col-md-6 pad"><span>Contact Number</span><span
|
<div class="col-md-6 pad"><span>Contact Number</span><span
|
||||||
class="badge">*</span>
|
class="badge">*</span>
|
||||||
<input type="text" name="ContactNumber"
|
<input type="text" name="ContactNumber"
|
||||||
@ -483,6 +485,26 @@ legend {
|
|||||||
class="form-control" onkeypress="return isNumberKey(event)">
|
class="form-control" onkeypress="return isNumberKey(event)">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="col-md-6 pad"><span>Gender</span><span
|
||||||
|
class="badge">*</span>
|
||||||
|
<select id="gender" name="gender" type="text" required
|
||||||
|
class="form-control select2">
|
||||||
|
<option value="">Select Gender</option>
|
||||||
|
<?php
|
||||||
|
if(!empty($Gender))
|
||||||
|
{
|
||||||
|
foreach ($Gender as $rl)
|
||||||
|
{
|
||||||
|
?>
|
||||||
|
<option value="<?php echo $rl->ConfigValue ?>">
|
||||||
|
<?php echo $rl->ConfigValue ?></option>
|
||||||
|
<?php
|
||||||
|
}
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div class="col-md-6 pad"><span>Date Of Birth</span><span
|
<div class="col-md-6 pad"><span>Date Of Birth</span><span
|
||||||
@ -511,34 +533,16 @@ legend {
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div class="col-md-6 pad"><span>Gender</span><span
|
|
||||||
class="badge">*</span>
|
|
||||||
<select id="gender" name="gender" type="text" required
|
|
||||||
class="form-control select2">
|
|
||||||
<option value="">Select Gender</option>
|
|
||||||
<?php
|
|
||||||
if(!empty($Gender))
|
|
||||||
{
|
|
||||||
foreach ($Gender as $rl)
|
|
||||||
{
|
|
||||||
?>
|
|
||||||
<option value="<?php echo $rl->ConfigValue ?>">
|
|
||||||
<?php echo $rl->ConfigValue ?></option>
|
|
||||||
<?php
|
|
||||||
}
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div class="col-md-6 pad" style="padding: 10px 0px;">
|
|
||||||
<div class="col-md-6">
|
|
||||||
|
<div class="col-md-6 pad">
|
||||||
|
|
||||||
<span>Blood group</span><span class="badge">*</span>
|
<span>Blood group</span><span class="badge">*</span>
|
||||||
<select id="bloodgroup" name="bloodgroup" required
|
<select id="bloodgroup" name="bloodgroup" required
|
||||||
class="form-control select2">
|
class="form-control select2">
|
||||||
<option value="">Blood group</option>
|
<option value="">Select Blood group</option>
|
||||||
<?php
|
<?php
|
||||||
if(!empty($BloodGroup))
|
if(!empty($BloodGroup))
|
||||||
{
|
{
|
||||||
@ -553,12 +557,13 @@ legend {
|
|||||||
?>
|
?>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-6"><span>Marital Status</span><span
|
|
||||||
class="badge">*</span>
|
<div class="col-md-6 pad">
|
||||||
|
<span>Marital Status</span><span class="badge">*</span>
|
||||||
<select id="MartialStatus" name="MartialStatus" type="text"
|
<select id="MartialStatus" name="MartialStatus" type="text"
|
||||||
required placeholder="Marital status"
|
required placeholder="Marital status"
|
||||||
class="form-control select2">
|
class="form-control select2">
|
||||||
<option value="">Marital Status</option>
|
<option value="">Select Marital Status</option>
|
||||||
<?php
|
<?php
|
||||||
if(!empty($Martial))
|
if(!empty($Martial))
|
||||||
{
|
{
|
||||||
@ -573,8 +578,9 @@ legend {
|
|||||||
?>
|
?>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@ -97,9 +97,6 @@
|
|||||||
.toast-message {
|
.toast-message {
|
||||||
font-size: 16px !important; /* Adjust font size as needed */
|
font-size: 16px !important; /* Adjust font size as needed */
|
||||||
}
|
}
|
||||||
</style>
|
|
||||||
<style>
|
|
||||||
|
|
||||||
.off-screen {
|
.off-screen {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
top: -100px;
|
top: -100px;
|
||||||
@ -187,7 +184,18 @@
|
|||||||
::-webkit-scrollbar-track {
|
::-webkit-scrollbar-track {
|
||||||
background-color: #f5f5f5;
|
background-color: #f5f5f5;
|
||||||
}
|
}
|
||||||
|
.menu-heading{
|
||||||
|
color: white;
|
||||||
|
font-size: 14px;
|
||||||
|
padding-top: 1px;
|
||||||
|
margin-bottom: unset;
|
||||||
|
padding: 10px;
|
||||||
|
border-top: 1px solid #484d50;
|
||||||
|
margin-top: 5px;
|
||||||
|
}
|
||||||
|
.menu-heading i{
|
||||||
|
margin-right: 5px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" crossorigin="anonymous">
|
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" crossorigin="anonymous">
|
||||||
@ -208,12 +216,13 @@
|
|||||||
<div>
|
<div>
|
||||||
<header class="main-header">
|
<header class="main-header">
|
||||||
<!-- Logo -->
|
<!-- Logo -->
|
||||||
<a href="<?php echo base_url(); ?>dashboard" class="logo">
|
<a href="<?php echo base_url(); ?>dashboard" class="logo" style="display: block;padding-left: 22px;">
|
||||||
<!-- mini logo for sidebar mini 50x50 pixels -->
|
<!-- mini logo for sidebar mini 50x50 pixels -->
|
||||||
<span class="logo-mini"><b>RI</b></span>
|
<!-- <span class="logo-mini"><b>RI</b></span> -->
|
||||||
|
<img class="logo-mini" src="<?php echo base_url(); ?>public/assets/dist/img/RI.png" style="width: 35px;margin-top: 13px;">
|
||||||
<!-- logo for regular state and mobile devices -->
|
<!-- logo for regular state and mobile devices -->
|
||||||
<!-- <span class="logo-lg"><b>RESICO</b></span> -->
|
<!-- <span class="logo-lg"><b>RESICO</b></span> -->
|
||||||
<img src="<?php echo base_url(); ?>public/assets/dist/img/RESICO (1).png" style="width: 140px;margin-top: 11px;">
|
<img src="<?php echo base_url(); ?>public/assets/dist/img/RESICO (2).png" style="width: 130px;margin-top: 13px;">
|
||||||
|
|
||||||
</a>
|
</a>
|
||||||
<!-- Header Navbar: style can be found in header.less -->
|
<!-- Header Navbar: style can be found in header.less -->
|
||||||
@ -341,8 +350,11 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<?php if($DEPCode == ADMIN) { ?>
|
||||||
|
<p class="menu-heading"><i class="fa fa-angle-right" aria-hidden="true"></i> PURCHASE</p>
|
||||||
|
<?php } ?>
|
||||||
|
|
||||||
|
|
||||||
<!-- <p style="color: white;padding-left: 10px;font-size: 13px;padding-top: 1px;margin-bottom: unset;">PURCHASE</p> -->
|
|
||||||
<!-- Requisition Starts Ends -->
|
<!-- Requisition Starts Ends -->
|
||||||
<?php if ($DEPCode != HR) { ?>
|
<?php if ($DEPCode != HR) { ?>
|
||||||
<?php if ($DEPCode != SECURITY) { ?>
|
<?php if ($DEPCode != SECURITY) { ?>
|
||||||
@ -782,8 +794,10 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<?php if($DEPCode == ADMIN) { ?>
|
||||||
|
<p class="menu-heading"><i class="fa fa-angle-right" aria-hidden="true"></i> INVENTORY</p>
|
||||||
|
<?php } ?>
|
||||||
|
|
||||||
<!-- <p style="color: white;padding-left: 10px;font-size: 13px;padding-top: 1px;margin-bottom: unset;">INVENTORY</p> -->
|
|
||||||
<!--STOCK -->
|
<!--STOCK -->
|
||||||
<?php if (empty($DepAccesslist)) { ?>
|
<?php if (empty($DepAccesslist)) { ?>
|
||||||
<?php if ($DEPCode == PRODUCTION) { ?>
|
<?php if ($DEPCode == PRODUCTION) { ?>
|
||||||
@ -910,9 +924,11 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<?php if($DEPCode == ADMIN) { ?>
|
||||||
|
<p class="menu-heading"><i class="fa fa-angle-right" aria-hidden="true"></i> PRODUCTION</p>
|
||||||
|
<?php } ?>
|
||||||
|
|
||||||
|
|
||||||
<!-- <p style="color: white;padding-left: 10px;font-size: 13px;padding-top: 1px;margin-bottom: unset;">PRODUCTION</p> -->
|
|
||||||
<!-- INPROCESS MODULE-->
|
<!-- INPROCESS MODULE-->
|
||||||
<?php if (empty($DepAccesslist)) { ?>
|
<?php if (empty($DepAccesslist)) { ?>
|
||||||
<?php if ($DEPCode == QUALITY) { ?>
|
<?php if ($DEPCode == QUALITY) { ?>
|
||||||
@ -1164,8 +1180,9 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<?php if($DEPCode == ADMIN) { ?>
|
||||||
<!-- <p style="color: white;padding-left: 10px;font-size: 13px;padding-top: 1px;margin-bottom: unset;">OTHERS</p> -->
|
<p class="menu-heading"><i class="fa fa-angle-right" aria-hidden="true"></i> OTHERS</p>
|
||||||
|
<?php } ?>
|
||||||
<!-- Master Menus starts -->
|
<!-- Master Menus starts -->
|
||||||
<?php if (empty($DepAccesslist)) { ?>
|
<?php if (empty($DepAccesslist)) { ?>
|
||||||
<?php if ($DEPCode == FINANCE ||
|
<?php if ($DEPCode == FINANCE ||
|
||||||
|
|||||||
@ -566,6 +566,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
var trIGRHTML = '';
|
var trIGRHTML = '';
|
||||||
|
|
||||||
$.each(parsedData, function(i, item) {
|
$.each(parsedData, function(i, item) {
|
||||||
if (igr == item.IGRNO) {
|
if (igr == item.IGRNO) {
|
||||||
console.log(item);
|
console.log(item);
|
||||||
@ -605,9 +606,11 @@
|
|||||||
var dcd = new Date(item.DeliveryChellanDate);
|
var dcd = new Date(item.DeliveryChellanDate);
|
||||||
var dcd2 = (String(dcd.getDate()).padStart(2, '0') + '-' + (String(dcd.getMonth() + 1).padStart(2, '0')) + '-' + dcd.getFullYear());
|
var dcd2 = (String(dcd.getDate()).padStart(2, '0') + '-' + (String(dcd.getMonth() + 1).padStart(2, '0')) + '-' + dcd.getFullYear());
|
||||||
$("#Invoice_Date").val(dcd2);
|
$("#Invoice_Date").val(dcd2);
|
||||||
var Mat_rcv_date = (item.MaterialRcvdDate === null) ? ' ' : formatDate(new Date(item.MaterialRcvdDate));
|
console.log(item.MaterialRcvdDate)
|
||||||
$("#MaterialRcvdDate").val(Mat_rcv_date);
|
var Mat_rcv_date = (item.MaterialRcvdDate === null) ? ' ' : formatDateTime(new Date(item.MaterialRcvdDate));
|
||||||
var gross_rcv_date = (item.GrossWeightDate === null) ? ' ' : formatDate(new Date(item.GrossWeightDate));
|
$("#MaterialRcvdDate").val(GrossWeightDate);
|
||||||
|
console.log(item.MaterialRcvdDate)
|
||||||
|
var gross_rcv_date = (item.GrossWeightDate === null) ? ' ' : formatDateTime(new Date(item.GrossWeightDate));
|
||||||
$("#ser").val(item.ServiceDescription);
|
$("#ser").val(item.ServiceDescription);
|
||||||
|
|
||||||
i = i + 1;
|
i = i + 1;
|
||||||
|
|||||||
BIN
public/assets/dist/img/RESICO (2).png
vendored
Normal file
BIN
public/assets/dist/img/RESICO (2).png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.0 KiB |
BIN
public/assets/dist/img/RI.png
vendored
Normal file
BIN
public/assets/dist/img/RI.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.9 KiB |
Loading…
Reference in New Issue
Block a user