From 6b73d9a26bab15c50a677ab57ba507c66f85b25f Mon Sep 17 00:00:00 2001 From: saravanakumar_kandasami Date: Tue, 9 May 2017 21:40:02 +0530 Subject: [PATCH] added new view in requisition listing and few modification --- application/controllers/requisitionlist.php | 6 ++ application/views/addCostCenter.php | 14 ++-- application/views/includes/header.php | 6 ++ application/views/requisitionlist.php | 29 ++++++- application/views/requisitionlisting.php | 92 +++++++++++++++++++++ 5 files changed, 134 insertions(+), 13 deletions(-) create mode 100644 application/views/requisitionlisting.php diff --git a/application/controllers/requisitionlist.php b/application/controllers/requisitionlist.php index 0c7773b5..f69ea03f 100644 --- a/application/controllers/requisitionlist.php +++ b/application/controllers/requisitionlist.php @@ -28,6 +28,12 @@ class requisitionlist extends BaseController /** * This function used to load the first screen of the user */ + function requisitionlisting() + { + $this->global['pageTitle'] = 'Siddharth : Requisition Listing'; + + $this->loadViews("requisitionlisting", $this->global, NULL); + } function requisition() { diff --git a/application/views/addCostCenter.php b/application/views/addCostCenter.php index d6441a80..08ea36fc 100644 --- a/application/views/addCostCenter.php +++ b/application/views/addCostCenter.php @@ -142,7 +142,7 @@ $(function() { ?> -
+
* @@ -175,8 +175,8 @@ $(function() {

-
-   Add Budget +
+   Add Budget @@ -654,10 +654,7 @@ $('.tempClickEdit').click(function(){ Selectedval =''; $('#txtSelectedDepartment').val(Selectedval); - - - - + var tempSelect = $('#selectDistriList option:selected').val(); $('#selectDistriList option:selected').remove().appendTo('#distriList'); $("#selectDistriList").attr('selectedIndex', '-1').find("option:selected").removeAttr("selected"); @@ -727,5 +724,4 @@ function validate() } } - - \ No newline at end of file + \ No newline at end of file diff --git a/application/views/includes/header.php b/application/views/includes/header.php index 0567a8f9..d1b5a540 100644 --- a/application/views/includes/header.php +++ b/application/views/includes/header.php @@ -253,6 +253,12 @@ Requisition List +
  • + + + Requisition Listing + +
    • diff --git a/application/views/requisitionlist.php b/application/views/requisitionlist.php index 1821e402..f6b4db50 100644 --- a/application/views/requisitionlist.php +++ b/application/views/requisitionlist.php @@ -275,6 +275,7 @@ Requisition Number Requisition Date Status + Commants @@ -284,22 +285,42 @@   REQ000001 2/3/2017 - Pending + + + + Need to get quick   REQ000001 5/4/2017 - Pending + + + + Need to get quick   REQ000001 9/4/2017 - Pending - + + + + Need to get quick diff --git a/application/views/requisitionlisting.php b/application/views/requisitionlisting.php new file mode 100644 index 00000000..63dbcc91 --- /dev/null +++ b/application/views/requisitionlisting.php @@ -0,0 +1,92 @@ + + +
    + +
    +

    +
    Siddharth Industries Requisition Listing
    + +

    +
    +
    +
    +
    +
    + Add Requisition +
    +
    +
    +
    +
    +
    +
    +

    +
    + + +
    +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Requisition No Requisition DateStatusDepartmentAction
    REQ0000015/5/2017activeadmin
    REQ0000026/5/2017activeadmin
    REQ0000037/5/2017activeadmin
    REQ0000048/5/2017activeadmin
    REQ0000059/5/2017activeadmin
    + +
    +
    +
    +
    +
    +
    + \ No newline at end of file