From be53b84383711c4e0f1ee1258a05b4886c3944bd Mon Sep 17 00:00:00 2001 From: saravanakumar_kandasami Date: Tue, 4 Apr 2017 19:36:38 +0530 Subject: [PATCH] added header and po pages --- application/controllers/assetdetails.php | 8 +- application/controllers/purchaseorder.php | 2 + application/controllers/purchaseorderform.php | 71 ++ application/controllers/requisitionform.php | 12 +- application/controllers/requisitionlist.php | 47 ++ application/views/addasset.php | 8 +- application/views/addsupplier.php | 22 +- application/views/dashboard.php | 5 +- application/views/editOldRawmaterial.php | 2 +- application/views/editOldasset.php | 143 ++-- application/views/editOldsupplier.php | 4 +- application/views/importpo.php | 725 ++++++++++++++++++ application/views/includes/header.php | 187 +++-- application/views/login.php | 2 +- application/views/purchaseorder.php | 546 +++++++++++++ application/views/requisitionform.php | 24 +- application/views/requisitionlist.php | 175 +++++ application/views/servicepo.php | 429 +++++++++++ assets/dist/css/skins/_all-skins.min.css | 5 +- 19 files changed, 2196 insertions(+), 221 deletions(-) create mode 100644 application/controllers/purchaseorderform.php create mode 100644 application/controllers/requisitionlist.php create mode 100644 application/views/importpo.php create mode 100644 application/views/purchaseorder.php create mode 100644 application/views/requisitionlist.php create mode 100644 application/views/servicepo.php diff --git a/application/controllers/assetdetails.php b/application/controllers/assetdetails.php index 4b8a2117..f9ce432f 100644 --- a/application/controllers/assetdetails.php +++ b/application/controllers/assetdetails.php @@ -129,7 +129,7 @@ class assetdetails extends BaseController $this->session->set_flashdata('error', 'Asset Not Create'); } - redirect('assetListing'); + redirect('assetdetails/assetListing'); } } @@ -198,7 +198,7 @@ class assetdetails extends BaseController $SupplierName = $this->input->post('SupplierName'); $DateOfPurchase = $this->input->post('DateOfPurchase'); $DateOfCommission = $this->input->post('DateOfCommission'); - $Createdby = $this->input->post('Createdby'); + $Createdby = $this->input->post('Createdby'); $AssetValue = $this->input->post('AssetValue'); $asset = array(); @@ -218,8 +218,8 @@ class assetdetails extends BaseController { $this->session->set_flashdata('error', 'Asset updation failed'); } - //echo success; - redirect('assetListing'); + echo $asset; + // redirect('assetListing'); } } diff --git a/application/controllers/purchaseorder.php b/application/controllers/purchaseorder.php index 3ba9c032..00ba1e32 100644 --- a/application/controllers/purchaseorder.php +++ b/application/controllers/purchaseorder.php @@ -71,6 +71,8 @@ class purchaseorder extends BaseController } } + + function ViewPurchaseOrder() { diff --git a/application/controllers/purchaseorderform.php b/application/controllers/purchaseorderform.php new file mode 100644 index 00000000..d0449774 --- /dev/null +++ b/application/controllers/purchaseorderform.php @@ -0,0 +1,71 @@ +load->model('purchaseorder_model'); + + $this->load->library('session'); + $this->load->library('form_validation'); + + $this->isLoggedIn(); + } + + /** + * This function used to load the first screen of the user + */ + + function purchaseorder() + { + + + + $this->global['pageTitle'] = 'Siddharth : Purchase order form'; + + $this->loadViews("Purchaseorder", $this->global, NULL); + + } + function servicepo() + { + + + + $this->global['pageTitle'] = 'Siddharth : Service PO'; + + $this->loadViews("servicepo", $this->global, NULL); + + } + function importpo() + { + + + + $this->global['pageTitle'] = 'Siddharth : Import PO'; + + $this->loadViews("importpo", $this->global, NULL); + + } + + function pageNotFound() + { + $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found'; + + $this->loadViews("404", $this->global, NULL, NULL); + } +} + +?> \ No newline at end of file diff --git a/application/controllers/requisitionform.php b/application/controllers/requisitionform.php index c5f42b53..252d3089 100644 --- a/application/controllers/requisitionform.php +++ b/application/controllers/requisitionform.php @@ -28,18 +28,8 @@ class requisitionform extends BaseController /** * This function used to load the first screen of the user */ - public function index() - { - $this->global['pageTitle'] = 'Siddharth : Requisition'; - - - - $this->loadViews("addPO", $this->global, NULL , NULL); - } - - - + function requisition() { $this->global['pageTitle'] = 'Siddharth : Requisition'; diff --git a/application/controllers/requisitionlist.php b/application/controllers/requisitionlist.php new file mode 100644 index 00000000..788a0886 --- /dev/null +++ b/application/controllers/requisitionlist.php @@ -0,0 +1,47 @@ +load->model('purchaseorder_model'); + + $this->load->library('session'); + $this->load->library('form_validation'); + + $this->isLoggedIn(); + } + + /** + * This function used to load the first screen of the user + */ + + function requisition() + { + $this->global['pageTitle'] = 'Siddharth : Requisition List'; + + $this->loadViews("requisitionlist", $this->global, NULL); + } + + function pageNotFound() + { + $this->global['pageTitle'] = 'CodeInsect : 404 - Page Not Found'; + + $this->loadViews("404", $this->global, NULL, NULL); + } +} + +?> \ No newline at end of file diff --git a/application/views/addasset.php b/application/views/addasset.php index 8b18a628..46185754 100644 --- a/application/views/addasset.php +++ b/application/views/addasset.php @@ -93,7 +93,7 @@
- +
@@ -103,7 +103,7 @@
- + +
diff --git a/application/views/addsupplier.php b/application/views/addsupplier.php index 1f49a230..74baa8b3 100644 --- a/application/views/addsupplier.php +++ b/application/views/addsupplier.php @@ -83,7 +83,7 @@
- +
@@ -126,21 +126,18 @@
- + -
@@ -173,7 +170,7 @@ @@ -313,12 +310,5 @@ function validatenumbers() { } } - function Validate() -{ -if($("option:selected", $("#PaymentTerms")).val() == '0') - { - alert('Please Select Payment Terms'); - return (true); - } -} + diff --git a/application/views/dashboard.php b/application/views/dashboard.php index b79eb4b6..92d032b7 100644 --- a/application/views/dashboard.php +++ b/application/views/dashboard.php @@ -1,9 +1,8 @@
-

- - Control panel +

+ Dashboard

diff --git a/application/views/editOldRawmaterial.php b/application/views/editOldRawmaterial.php index a90bd796..8eec53f3 100644 --- a/application/views/editOldRawmaterial.php +++ b/application/views/editOldRawmaterial.php @@ -56,7 +56,7 @@ if(!empty($userRecords))
- +
diff --git a/application/views/editOldasset.php b/application/views/editOldasset.php index 444ca810..79d48e81 100644 --- a/application/views/editOldasset.php +++ b/application/views/editOldasset.php @@ -9,9 +9,11 @@ $User = ''; $SupplierName = ''; $DateOfPurchase = ''; $DateOfCommission = ''; -$CreatedDate = ''; $AssetValue = ''; $Createdby = ''; + + + if(!empty($asset)) { foreach ($asset as $uf) @@ -19,21 +21,27 @@ if(!empty($asset)) $Asset_Code = $uf->Asset_Code; $Asset_Name = $uf->Asset_Name; $Description = $uf->Description; - $Department = $uf->Department; + $Department = $uf->Department; $Location = $uf->Location; $User = $uf->User; $SupplierName = $uf->SupplierName; $DateOfPurchase = $uf->DateOfPurchase; $DateOfCommission = $uf->DateOfCommission; - $CreatedDate = $uf->CreatedDate; - $AssetValue = $uf->AssetValue; $Createdby = $uf->Createdby; + $AssetValue = $uf->AssetValue; + } } ?> +
@@ -41,12 +49,11 @@ if(!empty($asset))
Asset Details
-
- Back + Back

@@ -58,34 +65,42 @@ if(!empty($asset))
-

Edit Asset Details

+

Edit Asset Details

-
+
- - - +
+ + + + +
-
+ +
+
- +
+
+
-
-
-
+ + +
- - +
-
- -
+
+ +
+
+
- +
+
+
-
+
+
- +
+
+
- -
- - + +
-
-
+
+
max= value="" class="form-control" placeholder="" />
-
+ +
max= value="" class="form-control" placeholder="" />
-
+
- - - - + + +
-
-
- + +
+
-
-
- load->helper('form'); - $error = $this->session->flashdata('error'); - if($error) - { - ?> -
- - session->flashdata('error'); ?> -
- - session->flashdata('success'); - if($success) - { - ?> -
- - session->flashdata('success'); ?> -
- - -
-
- ', '
'); ?> -
-
-
- -
-
+ - \ No newline at end of file diff --git a/application/views/editOldsupplier.php b/application/views/editOldsupplier.php index cf5573a2..5bfa5b76 100644 --- a/application/views/editOldsupplier.php +++ b/application/views/editOldsupplier.php @@ -201,14 +201,14 @@ function demo(){

Before - name="PaymentDays" value="before"/> + name="PaymentDays" value="before"/>
After - name="PaymentDays" value="after"/> + name="PaymentDays" value="after"/>
diff --git a/application/views/importpo.php b/application/views/importpo.php new file mode 100644 index 00000000..344faff2 --- /dev/null +++ b/application/views/importpo.php @@ -0,0 +1,725 @@ + +
+ + +
+ +
+

Import Purchase Order

+
+
+
+
+ +
+ 'Requistion No'); + //print_r( $options); + + if(!empty($POType)) + { + foreach ($SupplierName as $SID): + + + $options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName; + + endforeach; + } + + echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control required"','required="true"'); + + ?> +
+
+
+ +
+ 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true'); + echo form_input($data); + ?> +
+
+
+ +
+ 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true'); + echo form_input($data); + ?> +
+
+ +
+ +
+ 'Select Currency Type'); + //print_r( $options); + + if(!empty($POType)) + { + foreach ($SupplierName as $SID): + + + $options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName; + + endforeach; + } + + echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control required"','required="true"'); + + ?> +
+
+
+
+
+ +
+ 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true'); + echo form_input($data); + ?> +
+
+
+ +
+ 'Supplier'); + //print_r( $options); + + if(!empty($POType)) + { + foreach ($SupplierName as $SID): + + + $options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName; + + endforeach; + } + + echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control required"','required="true"'); + + ?> +
+
+
+ +
+ 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true'); + echo form_input($data); + ?> +
+
+
+ +
+ 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true'); + echo form_input($data); + ?> +
+
+
+
+
+ +
+ +
+
+ + + +
+
+ + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 R NoItem NameQuantityUOMRateTax %Total
 1001Waste SandTon100HighNo Change
 2002ResinLitre50HighChange
 3003ResinLitre100HighChange
+
+ +
+ 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true'); + echo form_input($data); + ?> +
+
+
+ + + +
+
+
+
+ +
\ No newline at end of file diff --git a/application/views/includes/header.php b/application/views/includes/header.php index 7230c5e1..c125609d 100644 --- a/application/views/includes/header.php +++ b/application/views/includes/header.php @@ -15,71 +15,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Siddharth Industries - - - - - + + + + + + + + + +
-
  • - Master Details + Master Details -
  • + +
  • - Requisition form + Requisition form
  • - - - + + +
  • + Purchase order Form + +
  • +
    - + load->helper('form'); ?>
    diff --git a/application/views/purchaseorder.php b/application/views/purchaseorder.php new file mode 100644 index 00000000..98ee3de8 --- /dev/null +++ b/application/views/purchaseorder.php @@ -0,0 +1,546 @@ + +
    + + +
    + +
    +

    Purchase Order

    +
    +
    +
    +
    + +
    + 'Requistion No'); + //print_r( $options); + + if(!empty($POType)) + { + foreach ($SupplierName as $SID): + + + $options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName; + + endforeach; + } + + echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control required"','required="true"'); + + ?> +
    +
    +
    + +
    + 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true'); + echo form_input($data); + ?> +
    +
    +
    + +
    + 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true'); + echo form_input($data); + ?> +
    +
    +
    + +
    + 'Supplier'); + //print_r( $options); + + if(!empty($POType)) + { + foreach ($SupplierName as $SID): + + + $options[$SID->SupplierID] = $SID->SupplierID.' '.' - '.' '.$SID->SupplierName; + + endforeach; + } + + echo form_dropdown('MaterialCode', $options,set_value('MaterialCode'),'id="MaterialCode"' ,'class="form-control required"','required="true"'); + + ?> +
    +
    +
    + +
    + 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true'); + echo form_input($data); + ?> +
    +
    +
    + +
    + 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true'); + echo form_input($data); + ?> +
    +
    +
    +
    +
    + +
    + +
    +
    + + + +
    +
    + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
     R NoItem NameQuantityUOMRateTax %Total
     1001Waste SandTon100HighNo Change
     2002ResinLitre50HighChange
     3003ResinLitre100HighChange
    +
    + +
    + 'Quantity','value' => set_value('Quantity'),'id'=>'Quantity', 'class' => 'form-control' ,'required' => 'true'); + echo form_input($data); + ?> +
    +
    +
    + + + +
    +
    +
    +
    + +
    \ No newline at end of file diff --git a/application/views/requisitionform.php b/application/views/requisitionform.php index 40254883..89e5f369 100644 --- a/application/views/requisitionform.php +++ b/application/views/requisitionform.php @@ -1,23 +1,13 @@ -
    - -
    - - - -

    SIA - Phase 1

    - -

    -
    +
    +
    - Exported at : -

    Requisition Form

    +
    -

    Requisition Form

    +

    Requisition Form

    @@ -148,7 +138,7 @@