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

Merge branch 'CI4-Application' of bitbucket.org:venbainformationtechnology/ria into CI4-Application

Browse Source
This commit is contained in:
VE10-Sanjeev 2024-08-05 11:33:31 +00:00
commit 84cf062161
5 changed files with 103 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
app/Views/addEmployee.php
View File

@ -457,24 +457,26 @@ legend {
<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>
<input type="text" name="FirstName"
onkeypress="return onlyAlphabets(event);" maxlength="100"
id="FirstName" class="form-control" required>
</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>
<input type="text" name="LastName" onkeypress="return onlyAlphabets(event);" maxlength="100" id="LastName" class="form-control" required>
</div> -->
</div>
<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
class="badge">*</span>
<input type="text" name="ContactNumber"
@ -483,6 +485,26 @@ legend {
class="form-control" onkeypress="return isNumberKey(event)">
</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 class="col-md-12">
<div class="col-md-6 pad"><span>Date Of Birth</span><span
@ -511,70 +533,54 @@ legend {
</div>
<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>
<select id="bloodgroup" name="bloodgroup" required
class="form-control select2">
<option value="">Blood group</option>
<option value="">Select Blood group</option>
<?php
if(!empty($BloodGroup))
{
foreach ($BloodGroup as $rl)
{
?>
<option value="<?php echo $rl->ConfigValue ?>">
<?php echo $rl->ConfigValue ?></option>
<?php
}
}
?>
if(!empty($BloodGroup))
{
foreach ($BloodGroup as $rl)
{
?>
<option value="<?php echo $rl->ConfigValue ?>">
<?php echo $rl->ConfigValue ?></option>
<?php
}
}
?>
</select>
</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"
required placeholder="Marital status"
class="form-control select2">
<option value="">Marital Status</option>
<option value="">Select Marital Status</option>
<?php
if(!empty($Martial))
{
foreach ($Martial as $rl)
{
?>
<option value="<?php echo $rl->ConfigValue ?>">
<?php echo $rl->ConfigValue ?></option>
<?php
}
}
?>
if(!empty($Martial))
{
foreach ($Martial as $rl)
{
?>
<option value="<?php echo $rl->ConfigValue ?>">
<?php echo $rl->ConfigValue ?></option>
<?php
}
}
?>
</select>
</div>
</div>
</div>
</div>
</div>
@ -835,8 +841,8 @@ legend {
title=" 10 digit number" onkeypress="return isNumberKey(event)">
</div>
<!-- <div class="col-md-4"><span>UA Number</span>
<input type="text" id="uano" maxlength="12" name="uano" class="form-control">
</div> -->
<input type="text" id="uano" maxlength="12" name="uano" class="form-control">
</div> -->
</div>
<legend>Nominee Details</legend>

51
app/Views/includes/header.php
View File

@ -92,14 +92,11 @@
<!-- toster cdn start -->
<link href="https://cdnjs.cloudflare.com/ajax/libs/toastr.js/latest/toastr.min.css" rel="stylesheet">
<!-- toster cdn end -->
<style>
/* Custom CSS to increase font size */
.toast-message {
<style>
/* Custom CSS to increase font size */
.toast-message {
font-size: 16px !important; /* Adjust font size as needed */
}
</style>
<style>
.off-screen {
position: fixed;
top: -100px;
@ -187,7 +184,18 @@
::-webkit-scrollbar-track {
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>
<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>
<header class="main-header">
<!-- 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 -->
<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 -->
<!-- <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>
<!-- 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 -->
<?php if ($DEPCode != HR) { ?>
<?php if ($DEPCode != SECURITY) { ?>
@ -782,8 +794,10 @@
<!-- <p style="color: white;padding-left: 10px;font-size: 13px;padding-top: 1px;margin-bottom: unset;">INVENTORY</p> -->
<?php if($DEPCode == ADMIN) { ?>
<p class="menu-heading"><i class="fa fa-angle-right" aria-hidden="true"></i> INVENTORY</p>
<?php } ?>
<!--STOCK -->
<?php if (empty($DepAccesslist)) { ?>
<?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-->
<?php if (empty($DepAccesslist)) { ?>
<?php if ($DEPCode == QUALITY) { ?>
@ -1164,8 +1180,9 @@
<!-- <p style="color: white;padding-left: 10px;font-size: 13px;padding-top: 1px;margin-bottom: unset;">OTHERS</p> -->
<?php if($DEPCode == ADMIN) { ?>
<p class="menu-heading"><i class="fa fa-angle-right" aria-hidden="true"></i> OTHERS</p>
<?php } ?>
<!-- Master Menus starts -->
<?php if (empty($DepAccesslist)) { ?>
<?php if ($DEPCode == FINANCE ||

9
app/Views/viewinwardgateregister.php
View File

@ -566,6 +566,7 @@
}
var trIGRHTML = '';
$.each(parsedData, function(i, item) {
if (igr == item.IGRNO) {
console.log(item);
@ -605,9 +606,11 @@
var dcd = new Date(item.DeliveryChellanDate);
var dcd2 = (String(dcd.getDate()).padStart(2, '0') + '-' + (String(dcd.getMonth() + 1).padStart(2, '0')) + '-' + dcd.getFullYear());
$("#Invoice_Date").val(dcd2);
var Mat_rcv_date = (item.MaterialRcvdDate === null) ? ' ' : formatDate(new Date(item.MaterialRcvdDate));
$("#MaterialRcvdDate").val(Mat_rcv_date);
var gross_rcv_date = (item.GrossWeightDate === null) ? ' ' : formatDate(new Date(item.GrossWeightDate));
console.log(item.MaterialRcvdDate)
var Mat_rcv_date = (item.MaterialRcvdDate === null) ? ' ' : formatDateTime(new Date(item.MaterialRcvdDate));
$("#MaterialRcvdDate").val(GrossWeightDate);
console.log(item.MaterialRcvdDate)
var gross_rcv_date = (item.GrossWeightDate === null) ? ' ' : formatDateTime(new Date(item.GrossWeightDate));
$("#ser").val(item.ServiceDescription);
i = i + 1;

BIN
public/assets/dist/img/RESICO (2).png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
public/assets/dist/img/RI.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.9 KiB