Merge : GWM

This commit is contained in:
bitbucket 2024-09-02 08:30:04 +05:30
parent bedb4aa236
commit 70ad55f089
4 changed files with 17 additions and 18 deletions

View File

@ -1,9 +1,7 @@
<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>
<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datepicker/1.5.0/css/bootstrap-datepicker.css"
rel="stylesheet">
<?php <?php
@ -202,11 +200,11 @@ $currentday = date('d');
$attributes = array('id' => 'atten'); $attributes = array('id' => 'atten');
echo form_open('attendance', $attributes); ?> echo form_open('attendance', $attributes); ?>
<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'); <input type="text" name="month" id="month" value="<?php echo $datefordropdown; ?>" class="form-control" data-provide="datepicker" data-date-format="M-yyyy" data-date-min-view-mode="1">
echo form_input($data);
?>
</div> </div>
<div class="col-3"> <div class="col-3">
<input type="submit" value="Change Month" class="btn btn-success" <input type="submit" value="Change Month" class="btn btn-success"
@ -488,7 +486,7 @@ $currentday = date('d');
<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,

View File

@ -64,6 +64,9 @@
<script src="<?php echo base_url(); ?>public/new_assets/libs/select2/js/select2.min.js"></script> <script src="<?php echo base_url(); ?>public/new_assets/libs/select2/js/select2.min.js"></script>
<!-- <script src="<?php echo base_url(); ?>public/new_assets/js/validation.js" type="text/javascript"></script> --> <!-- <script src="<?php echo base_url(); ?>public/new_assets/js/validation.js" type="text/javascript"></script> -->
<script src="<?php echo base_url(); ?>public/new_assets/libs/bootstrap-datepicker/js/bootstrap-datepicker.min.js"></script>
<script> <script>

View File

@ -62,6 +62,8 @@
<!-- Scroll the table left to right --> <!-- Scroll the table left to right -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.13/jquery.mousewheel.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-mousewheel/3.1.13/jquery.mousewheel.min.js"></script>
<link href="<?php echo base_url(); ?>public/new_assets/libs/bootstrap-datepicker/css/bootstrap-datepicker.min.css" rel="stylesheet" type="text/css" />
<style> <style>
::-webkit-scrollbar { ::-webkit-scrollbar {
width: 5px; width: 5px;

View File

@ -64,19 +64,15 @@
<a href="index.html" class="logo logo-dark text-center"> <a href="index.html" class="logo logo-dark text-center">
<span class="logo-lg"> <span class="logo-lg">
<img src="<?php echo base_url('public/new_assets/images/RI_logo.png'); ?> " alt="" <img src="<?php echo base_url('public/new_assets/images/RI_logo.png'); ?> " alt=""
height="60"> height="100">
</span>
</a>
<a href="index.html" class="logo logo-dark text-center">
<span class="logo-lg">
<img src="<?php echo base_url(); ?> " alt="" height="22">
</span> </span>
</a> </a>
<a href="index.html" class="logo logo-light text-center"> <a href="index.html" class="logo logo-light text-center">
<span class="logo-lg"> <span class="logo-lg">
<img src="<?php echo base_url('public/new_assets/images/RI_logo.png'); ?> " alt="" <img src="<?php echo base_url('public/new_assets/images/RI_logo.png'); ?> " alt=""
height="60"> height="100">
</span> </span>
</a> </a>
<a href="index.html" class="logo logo-light text-center"> <a href="index.html" class="logo logo-light text-center">
@ -88,8 +84,8 @@
</div> </div>
<!-- title--> <!-- title-->
<h4 class="mt-0">Sign In</h4> <!-- <h4 class="mt-0">Sign In</h4> -->
<br>
<!-- form --> <!-- form -->
<form action="<?php echo base_url(); ?>loginMe" method="post"> <form action="<?php echo base_url(); ?>loginMe" method="post">