From 70ad55f089e27f8ba6b8d5b3df9599be26b0a410 Mon Sep 17 00:00:00 2001
From: bitbucket <bitbucket@venbainfotech.com>
Date: Mon, 2 Sep 2024 08:30:04 +0530
Subject: [PATCH] Merge : GWM

---
 app/Views/attendance.php          | 16 +++++++---------
 app/Views/includes/new_footer.php |  3 +++
 app/Views/includes/new_header.php |  2 ++
 app/Views/login.php               | 14 +++++---------
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/app/Views/attendance.php b/app/Views/attendance.php
index 3294b027..b2639110 100644
--- a/app/Views/attendance.php
+++ b/app/Views/attendance.php
@@ -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.min.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">
+<!-- <script src="<?php echo base_url() ?>public/assets/js/jquery.CongelarFilaColumna.js"></script> -->
+
 
 
 <?php
@@ -202,11 +200,11 @@ $currentday = date('d');
                                 $attributes = array('id' => 'atten');
                                 echo form_open('attendance', $attributes); ?>
                                 <div class="row">
+                                
                                     <div class="col-3">
-                                        <?php $today = date('M-Y');
-                                        $data = array('type'  => 'text', 'name'  => 'month', 'id' => 'month', 'value' => $datefordropdown, 'class' => 'form-control select2');
-                                        echo form_input($data);
-                                        ?>
+                                    <?php $today = date('M-Y'); ?>
+                                    <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">
+
                                     </div>
                                     <div class="col-3">
                                         <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">
     $("#month").datepicker({
         minViewMode: 1,
diff --git a/app/Views/includes/new_footer.php b/app/Views/includes/new_footer.php
index 1fc7ba40..5e0753ce 100644
--- a/app/Views/includes/new_footer.php
+++ b/app/Views/includes/new_footer.php
@@ -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/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>
diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php
index dd14e7b8..c9114af6 100644
--- a/app/Views/includes/new_header.php
+++ b/app/Views/includes/new_header.php
@@ -62,6 +62,8 @@
         <!-- Scroll the table left to right -->
         <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>
         ::-webkit-scrollbar {
 			width: 5px;
diff --git a/app/Views/login.php b/app/Views/login.php
index ae91e7ae..42b12b43 100644
--- a/app/Views/login.php
+++ b/app/Views/login.php
@@ -64,19 +64,15 @@
                             <a href="index.html" class="logo logo-dark text-center">
                                 <span class="logo-lg">
                                     <img src="<?php echo base_url('public/new_assets/images/RI_logo.png'); ?> " alt=""
-                                        height="60">
-                                </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">
+                                        height="100">
                                 </span>
                             </a>
+                           
 
                             <a href="index.html" class="logo logo-light text-center">
                                 <span class="logo-lg">
                                     <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-light text-center">
@@ -88,8 +84,8 @@
                     </div>
 
                     <!-- title-->
-                    <h4 class="mt-0">Sign In</h4>
-                    <br>
+                    <!-- <h4 class="mt-0">Sign In</h4> -->
+                   
 
                     <!-- form -->
                     <form action="<?php echo base_url(); ?>loginMe" method="post">