From c3e7e73142fef1433a98d1a53c3a9650bd01e896 Mon Sep 17 00:00:00 2001
From: VE10-Sanjeev <sanjeev.p@venbainfotech.com>
Date: Tue, 13 Aug 2024 05:14:29 +0000
Subject: [PATCH] FIX_ merged reqlist

---
 app/Views/editImportAmendPO.php  |   8 +-
 app/Views/requisitionlisting.php | 126 ++++++++++++++++++++-----------
 2 files changed, 84 insertions(+), 50 deletions(-)

diff --git a/app/Views/editImportAmendPO.php b/app/Views/editImportAmendPO.php
index ac3e087d..80d66663 100644
--- a/app/Views/editImportAmendPO.php
+++ b/app/Views/editImportAmendPO.php
@@ -576,7 +576,7 @@ if (!empty($RequistionDetails)) {
                             </div>
                         </div>
                         <div class="col-md-3">
-                            <label for="payablefrom">Import Options</label>
+                            <label for="payablefrom">Import Type Options<span class="badge mandatory">*</span></label>
 
                             <?php
                             //$options1 = array("0"=>'Select Import Option');       
@@ -602,7 +602,7 @@ if (!empty($RequistionDetails)) {
 
                         </div>
                         <div class="col-md-3">
-                            <label for="payablefrom">Payable Terms</label>
+                            <label for="payablefrom">Payable Terms<span class="badge mandatory">*</span></label>
                             <input type="hidden" name="beforePaymentTerms" value="<?php echo $Terms; ?>">
 
 
@@ -651,7 +651,7 @@ if (!empty($RequistionDetails)) {
                 <div class="row">
                     <div class="col-md-12">
                         <div class="col-md-3">
-                            <label for="payablefrom">Insurance</label>
+                            <label for="payablefrom">Insurance<span class="badge mandatory">*</span></label>
 
 
 
@@ -695,7 +695,7 @@ if (!empty($RequistionDetails)) {
                             </div>
                         </div>
                         <div class="col-md-3">
-                            <label for="BudgetType">Budget Type</label>
+                            <label for="BudgetType">Budget Type<span class="badge mandatory">*</span></label>
                             <select id='BudgetType' name='BudgetType'>
                                 <?php if ($BudgetType == 'CAPITAL') {
                                     $opt1 = 'CAPITAL';
diff --git a/app/Views/requisitionlisting.php b/app/Views/requisitionlisting.php
index baf3bf6f..98db8553 100644
--- a/app/Views/requisitionlisting.php
+++ b/app/Views/requisitionlisting.php
@@ -82,39 +82,66 @@ span.highlight {
 
         <div class="row">
             <div class="col-xs-12">
-              <div class="box">
-                <div class="box-header">
-					<center><b><h3 class="box-title">Requisition Listing</h3></b></center>
-                     
-                </div><!-- /.box-header -->
-				<?php if($DraftCount > 0 ) {?><p style="text-align: center;">
-                  <span class="highlight">The Requisition No <b><?php echo $ReqNo;?></b> is in Draft status.</span>  Please act on the requisition.<span class="highlight">Then only you can raise New Requisition. </span>
-				</p> <?php } ?>
-                <div class="row">
-            <div class="col-md-12 text-right" style="margin-left:-2%;">
-                <div class="form-group">
-				   <?php if($DraftCount == 0)
-				   {					   ?>
-				   <a class="btn btn-success" onclick="Test()" href="<?php echo base_url(); ?>RequisitionForm">Raise New Requisition</a><?php   }?>
-					
-                </div>
-            </div>
-        </div>
-                  <table id="Requisition"  class="table table-bordered table-hover" style="background-color:#fff;font-size:12px;">
-				  <thead style="background-color: #ddd;">
-				    <tr>
-					  <th>Requisted Date</th>	
-                      <th>Requisition No</th>
-					  <th>Requisition Type</th> 
-					  <th>Tot No.OfLineItem </th>
-					  <th>Po CreatedLineItem</th>
-					  <th>Partially PoCreatedLineItem</th>
-					  <th>NewLine Item</th>					   
-					  <th>Status</th>
-					  <th>Action</th>						 						                       
-                 
-						  </tr>
-                </thead>	
+                <div class="box">
+
+                    <div class="box-header">
+                        <center><b>
+                                <h3 class="box-title">Requisition Listing</h3>
+                            </b></center>
+
+                    </div><!-- /.box-header -->
+
+                    <?php if($DraftCount > 0 ) {?><p style="text-align: center;">
+                        <span class="highlight">The Requisition No <b><?php echo $ReqNo;?></b> is in Draft
+                            status.</span> Please act on the requisition.<span class="highlight">Then only you can raise
+                            New Requisition. </span>
+                    </p> <?php } ?>
+
+                    <div class="row">
+                        <div class="col-md-12 text-right" style="margin-left:-2%;">
+                            <div class="form-group">
+
+                                <div class="col-md-8">
+                                    <form class="Date-filter-form" id="DateRangeFilter" >
+									    <input type="hidden"  name="table" value="requisition">
+                                        <label for="fromDate">From:</label>
+                                        <input type="text" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
+
+                                        <label for="toDate">To:</label>
+                                        <input type="text" id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required>
+
+                                        <button type="submit">Search</button>
+										<i class="fa fa-repeat" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
+										<div class="error" id="error"></div>
+                                    </form>
+                                </div>
+
+                                <div class="col-md-4">
+                                    <?php if($DraftCount == 0) { ?>
+                                    <a class="btn btn-success" onclick="Test()"
+                                        href="<?php echo base_url(); ?>RequisitionForm">Raise New Requisition</a>
+                                    <?php   }?>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <table id="Requisition" class="table table-bordered table-hover"
+                        style="background-color:#fff;font-size:12px;">
+                        <thead style="background-color: #ddd;">
+                            <tr>
+                                <th>Requisted Date</th>
+                                <th>Requisition No</th>
+                                <th>Requisition Type</th>
+                                <th>Tot No.OfLineItem </th>
+                                <th>Po CreatedLineItem</th>
+                                <th>Partially PoCreatedLineItem</th>
+                                <th>NewLine Item</th>
+                                <th>Status</th>
+                                <th>Action</th>
+
+                            </tr>
+                        </thead>
 
 
 
@@ -129,21 +156,28 @@ span.highlight {
                             <td> <?php $Pdt =	new DateTime($record->CreatedDate );
 							$PODate =  $Pdt->format('d-m-Y');
 					       echo $PODate ?>
-					</td> 
-					<td><?php echo $record->ReqNo ?></td>                     
-					<td><?php echo $record->ReqType ?></td> 
-                    <td><?php echo $record->TotalNoofLineItems ?></td> 
-                     <td><?php echo $record->PolineItems ?></td> 
-                      <td><?php echo $record->PartilallyLineItems ?></td> 
-                     <td> <?php echo $record->newLineItem ?></td> 
+                            </td>
+                            <td><?php echo $record->ReqNo ?></td>
+                            <td><?php echo $record->ReqType ?></td>
+                            <td><?php echo $record->TotalNoofLineItems ?></td>
+                            <td><?php echo $record->PolineItems ?></td>
+                            <td><?php echo $record->PartilallyLineItems ?></td>
+                            <td> <?php echo $record->newLineItem ?></td>
 
 
-					<td><?php echo $record->StatusName ?></td>                     
-					                    
-					<td>   <a  	 data-toggle="tooltip"  href="<?php echo base_url().'EditRequisitionForm?ReqNo='.$record->ReqNo.'&ReqType='.$record->ReqType; ?>"><i class="fa fa-pencil" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?>  -  Click here to view Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a data-toggle="tooltip"  onclick="DeleteRow('<?php echo $record->ReqNo; ?>' )"   ><span class="glyphicon glyphicon-trash" title="<?php echo $record->ReqNo; ?>  -  Click here to Delete Requisition details"></span></a> </td>            
-                    </tr>
-					
-                 <?php
+                            <td><?php echo $record->StatusName ?></td>
+
+                            <td> <a data-toggle="tooltip"
+                                    href="<?php echo base_url().'EditRequisitionForm?ReqNo='.$record->ReqNo.'&ReqType='.$record->ReqType; ?>"><i
+                                        class="fa fa-pencil" data-toggle="tooltip"
+                                        title="<?php echo $record->ReqNo; ?>  -  Click here to view Requisition details"></i>&nbsp;&nbsp;&nbsp;</a>
+                                <a data-toggle="tooltip" onclick="DeleteRow('<?php echo $record->ReqNo; ?>' )"><span
+                                        class="glyphicon glyphicon-trash"
+                                        title="<?php echo $record->ReqNo; ?>  -  Click here to Delete Requisition details"></span></a>
+                            </td>
+                        </tr>
+
+                        <?php
                         }
                     }
                     ?>