From 83e34bfba471d5ca145f387748652acb07d9b601 Mon Sep 17 00:00:00 2001 From: bitbucket Date: Wed, 31 Jul 2024 17:49:29 +0530 Subject: [PATCH] CHANGES_in ul related change in header : GWM --- app/Views/createPOfromRequistion.php | 46 +- app/Views/includes/header.php | 697 +++++++++++++++------------ app/Views/requisitionlisting.php | 18 +- 3 files changed, 441 insertions(+), 320 deletions(-) diff --git a/app/Views/createPOfromRequistion.php b/app/Views/createPOfromRequistion.php index ff7dc4fe..c87b9db2 100644 --- a/app/Views/createPOfromRequistion.php +++ b/app/Views/createPOfromRequistion.php @@ -26,6 +26,13 @@ { min-height: 733px; } + #REQLIST_filter{ + float: inline-end; + } + #REQLIST_wrapper .row .col-sm-4{ + flex-basis: 50%; + float: inline-end; + }
Select + Requested Date Requistion Number Requistion Type Requested By - Requested Date Tot. No. Of Line Items Po Created Line Items Partial PO Created Line Items @@ -251,14 +258,17 @@ ?>   - ReqNo; ?> - ReqType; ?> - FirstName; ?> - ReqDate); + + ReqDate); $RequestedDate = $dt->format('d-m-Y'); echo $RequestedDate; - ?> + ?> + + ReqNo; ?> + ReqType; ?> + FirstName; ?> + TotalNoofLineItems; ?> PolineItems; ?> PartilallyLineItems; ?> @@ -367,7 +377,7 @@ function selectReqNo(rowId) if(!ckb ) { - var removeItem = cellval[1].innerText; + var removeItem = cellval[2].innerText; $.each(RequistionList.Req, function(i, el){ @@ -389,13 +399,13 @@ function selectReqNo(rowId) if(RequistionList.Req.length > 0) { - if(Type == cellval[2].innerText ) + if(Type == cellval[3].innerText ) { RequistionList.Req.push({ - "ReqNo" : cellval[1].innerText, - "ReqType" : cellval[2].innerText, - "ReqBy" : cellval[3].innerText, + "ReqNo" : cellval[2].innerText, + "ReqType" : cellval[3].innerText, + "ReqBy" : cellval[4].innerText, }); @@ -413,11 +423,11 @@ function selectReqNo(rowId) RequistionList.Req.push({ - "ReqNo" : cellval[1].innerText, - "ReqType" : cellval[2].innerText, - "ReqBy" : cellval[3].innerText, + "ReqNo" : cellval[2].innerText, + "ReqType" : cellval[3].innerText, + "ReqBy" : cellval[4].innerText, }); - Type =cellval[2].innerText; + Type =cellval[3].innerText; } @@ -477,8 +487,8 @@ $(function () { "paging": true, "lengthChange": true, "searching": true, - "columnDefs" : [{"targets":4, "type":"date-eu"}], - "aaSorting": [[ 4, "desc" ]], + "columnDefs" : [{"targets":1, "type":"date-eu"}], + "aaSorting": [[ 2, "desc" ]], "ordering": true, "info": true, "autoWidth": true diff --git a/app/Views/includes/header.php b/app/Views/includes/header.php index bda116c7..e378d958 100644 --- a/app/Views/includes/header.php +++ b/app/Views/includes/header.php @@ -173,6 +173,20 @@ background-color: #28a745; /* Change this to your preferred background color */ border: 1px solid #155724; /* Change this to your preferred border color */ } + + ::-webkit-scrollbar { + width: 5px; + height: 5px; + background-color: #f5f5f5; + } + ::-webkit-scrollbar-thumb { + background-color: #797a7c; + border-radius: 15px; + height: 5px; + } + ::-webkit-scrollbar-track { + background-color: #797a7c; + } @@ -323,31 +337,10 @@ - -
  • - - - Complaint - - - - - -
    • - - + + +

    PURCHASE

    @@ -477,8 +470,318 @@ + + + +
  • + + + Purchase order + + + + + +
    • + + + + + + AssDep; + if ( + $assd == PURCHASE || + $assd == FINANCE || + $assd == MANAGEMENT || + $DEPCode == PURCHASE || + $DEPCode == FINANCE || + $DEPCode == MANAGEMENT + ) { + $check = $check + 1; ?> +
  • + + + Purchase order + + + + + +
    • + AssDep; + $check1 = 1; + ?> + + + + + + + + + + + +
  • + + + Old Inspection + + + + + +
    • + + + + + AssDep; + //echo $assd; + if ( + $assd == STORE || + $DEPCode == QUALITY || + $assd == QUALITY || + $DEPCode == STORE || + $DEPCode == SECURITY || + $assd == SECURITY + ) { + $check81 = $check81 + 1; ?> +
  • + + + Inward + + + + + +
    • + + + AssDep; ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

    INVENTORY

    @@ -592,6 +895,22 @@ }} ?> + + + + + + + + + + + + + + + +

    PRODUCTION

    @@ -665,7 +984,10 @@ } ?> - + + + + @@ -755,7 +1077,11 @@ - + + + + + @@ -825,6 +1151,19 @@ + + + + + + + + + + + + +

    OTHERS

    + + + - - - -
  • - - - Purchase order - - - - - -
    • - - - - - - AssDep; - if ( - $assd == PURCHASE || - $assd == FINANCE || - $assd == MANAGEMENT || - $DEPCode == PURCHASE || - $DEPCode == FINANCE || - $DEPCode == MANAGEMENT - ) { - $check = $check + 1; ?> -
  • - - - Purchase order - - - - - -
    • - AssDep; - $check1 = 1; - ?> - - - - - - - - @@ -1714,99 +1874,13 @@ } } ?> - - -
  • - - - Old Inspection - - - - - -
    • - - - - - AssDep; - //echo $assd; - if ( - $assd == STORE || - $DEPCode == QUALITY || - $assd == QUALITY || - $DEPCode == STORE || - $DEPCode == SECURITY || - $assd == SECURITY - ) { - $check81 = $check81 + 1; ?> -
  • - - - Inward - - - - - -
    • - - AssDep; ?> - - - - + + + + + + + + +
  • + + + Complaint + + + + + +
    • + diff --git a/app/Views/requisitionlisting.php b/app/Views/requisitionlisting.php index c27bc6c9..848e3948 100644 --- a/app/Views/requisitionlisting.php +++ b/app/Views/requisitionlisting.php @@ -19,9 +19,19 @@ flex-basis: 50%; float: inline-end; } - #Requisition_paginate.row .col-sm-6{ + #Requisition_paginate .pagination { flex-basis: 50%; float: inline-end; + margin:0 0 15px; + } + #Requisition_wrapper .row:nth-child(3), #Requisition_wrapper .row:nth-child(1){ + padding: 0 15px; + } + #Requisition_info{ + margin-top: 5px; + } + .dataTables_wrapper{ + padding-bottom: 0; } @@ -63,7 +73,9 @@ span.highlight { background-color: yellow; } + +
    @@ -75,11 +87,11 @@ span.highlight {

    Requisition Listing

    - 0 ) {?>

    + 0 ) {?>

    The Requisition No is in Draft status. Please act on the requisition.Then only you can raise New Requisition.

    -
    +