From b6b3907f99b7f4b17e8d9e21053c5265be84af62 Mon Sep 17 00:00:00 2001 From: saravanakumar_kandasami Date: Mon, 24 Jul 2017 17:54:02 +0530 Subject: [PATCH] UI debugs in material master --- application/controllers/employeedetails.php | 2 +- application/controllers/supplier.php | 2 +- application/views/addCostCenter.php | 37 +++++++------ application/views/addNew.php | 59 ++++++++++----------- application/views/addRawMaterial.php | 31 +++++------ application/views/addasset.php | 6 +-- application/views/addcost.php | 8 +-- application/views/addemployee.php | 20 +++---- application/views/addsupplier.php | 23 +++----- application/views/editEmployee.php | 25 ++++----- application/views/editOld.php | 48 +++++++---------- application/views/editOldRawmaterial.php | 42 +++++++-------- application/views/editOldasset.php | 16 +++--- application/views/editOldcost.php | 36 ++++++------- application/views/editOldemployee.php | 8 +-- application/views/editSupplier.php | 16 +++--- application/views/rawmaterialListing.php | 7 +-- application/views/supplierListing.php | 11 ++-- application/views/users.php | 2 +- 19 files changed, 177 insertions(+), 222 deletions(-) diff --git a/application/controllers/employeedetails.php b/application/controllers/employeedetails.php index af95a1c2..dd72cab6 100755 --- a/application/controllers/employeedetails.php +++ b/application/controllers/employeedetails.php @@ -395,7 +395,7 @@ echo ""; $data['DepartmentList'] = $this->employeedetails_model->getDepartment(); $data['EmpDetails'] = $this->employeedetails_model->viewemployee($EmpID); - $this->global['pageTitle'] = 'Siddharth : View Employee'; + $this->global['pageTitle'] = 'Siddharth : Edit Employee'; $this->loadViews("editEmployee", $this->global, $data, NULL); diff --git a/application/controllers/supplier.php b/application/controllers/supplier.php index ced6cb41..32f8d1d8 100755 --- a/application/controllers/supplier.php +++ b/application/controllers/supplier.php @@ -56,7 +56,7 @@ class supplier extends BaseController $data['payment'] = $this->supplier_model->getpayment(); //$data['users'] = $this->purchaseorder_model->getusers(); - $this->global['pageTitle'] = 'siddharth : AddNew Supplier'; + $this->global['pageTitle'] = 'siddharth : Add New Supplier'; $this->loadViews("addsupplier", $this->global,$data, NULL); diff --git a/application/views/addCostCenter.php b/application/views/addCostCenter.php index 14bc59e3..057337fc 100755 --- a/application/views/addCostCenter.php +++ b/application/views/addCostCenter.php @@ -38,7 +38,7 @@ $(function() { display: none; } -
+

@@ -47,7 +47,7 @@ $(function() {

- Back + Back

@@ -66,7 +66,7 @@ $(function() {
- * + *
- * + *
'CostName','value' => set_value('CostName'),'id'=>'CostName', 'class' => 'form-control' ,'required' => 'true','style'=>'text-transform:uppercase;','maxlength'=>'20'); @@ -117,8 +117,8 @@ $(function() {
-
-
+
+
@@ -132,10 +132,9 @@ $(function() { ?>
-
- -
- * +
+ + *
-
+
@@ -166,7 +165,7 @@ $(function() {
-   Add Budget +   Add Budget @@ -258,8 +257,8 @@ $(function() {
-   Add - cancel +   Add + cancel
@@ -367,8 +366,8 @@ $(function() {
-   Edit - cancel +   Edit + cancel
@@ -381,9 +380,9 @@ $(function() {
- - - Cancel + + + Cancel
diff --git a/application/views/addNew.php b/application/views/addNew.php index 173ab00c..ae661cb7 100755 --- a/application/views/addNew.php +++ b/application/views/addNew.php @@ -1,8 +1,8 @@ -
+

-
User Management
+
Siddharth Industries - Add New User

@@ -10,9 +10,9 @@
- Back + Back
-
+
@@ -21,9 +21,7 @@
-
-

Siddharth Industries - Add New User

-
+
@@ -31,7 +29,7 @@
- +
-
+
+
+
+
+ + +
-
-
- - -
-
+
@@ -101,16 +100,7 @@
- - -
-
- - -
- -
-
+
-
-
+
+
-
+
+
+ + +
+ +
- - + + +
diff --git a/application/views/addRawMaterial.php b/application/views/addRawMaterial.php index 4ba711b3..00716c6e 100755 --- a/application/views/addRawMaterial.php +++ b/application/views/addRawMaterial.php @@ -24,7 +24,7 @@ function BlockSpecial(evt) { } -
+

@@ -36,7 +36,7 @@ function BlockSpecial(evt) {
- Back + Back

@@ -52,14 +52,14 @@ function BlockSpecial(evt) {
- Material Name* + *
- Material Type* + *
- Unit of Measurement* + *
- Cost Center Code +
- Conversion Factor UOM +
- Remarks +
- IsActive
+
@@ -210,8 +210,9 @@ function BlockSpecial(evt) {
- - + + +
diff --git a/application/views/addasset.php b/application/views/addasset.php index 261a2231..2f948059 100755 --- a/application/views/addasset.php +++ b/application/views/addasset.php @@ -63,7 +63,7 @@ $("#DeliveryDate").datepicker({
- Back + Back

@@ -305,8 +305,8 @@ $("#DeliveryDate").datepicker({
- - + +
diff --git a/application/views/addcost.php b/application/views/addcost.php index 9cd17188..c7029a7c 100755 --- a/application/views/addcost.php +++ b/application/views/addcost.php @@ -1,4 +1,4 @@ -
+

@@ -10,7 +10,7 @@
- Back + Back

@@ -57,8 +57,8 @@

- - + +
diff --git a/application/views/addemployee.php b/application/views/addemployee.php index 2ba937a7..cf153941 100755 --- a/application/views/addemployee.php +++ b/application/views/addemployee.php @@ -295,7 +295,7 @@ function onlyAlphabets(evt) {
- Back + Back

@@ -313,7 +313,7 @@ function onlyAlphabets(evt) {
-
+
Personal Information @@ -590,18 +590,14 @@ function onlyAlphabets(evt) {
- - - -
-
-
- +
+ +
+
-
-
-
+ +
diff --git a/application/views/addsupplier.php b/application/views/addsupplier.php index 118d8463..5dbc40a1 100755 --- a/application/views/addsupplier.php +++ b/application/views/addsupplier.php @@ -217,9 +217,11 @@ $(function() { -
+

-
Siddharth Industries - Edit Cost List
+
Siddharth Industries - Edit Cost Center

@@ -118,7 +118,7 @@ $(function() {
- Back + Back

@@ -141,7 +141,7 @@ $(function() {
- * + *
- * + *
'CostName','value' => set_value('CostName',$CostCenterName),'id'=>'CostName', 'class' => 'form-control' ,'required' => 'true','style'=>'text-transform:uppercase;','maxlength'=>'20'); @@ -164,8 +164,8 @@ $(function() {
-
Budget Year:* +
+ *
-
Approved By:* +
+ *
-
-
+
+
@@ -274,7 +274,7 @@ $(function() {
@@ -365,8 +365,8 @@ $(function() {
-   Add - cancel +   Add + cancel
@@ -507,8 +507,8 @@ $(function() {
-   Edit - cancel +   Edit + cancel
@@ -520,8 +520,8 @@ $(function() {
- - Cancel + + Cancel
diff --git a/application/views/editOldemployee.php b/application/views/editOldemployee.php index d265ae2b..90510d58 100755 --- a/application/views/editOldemployee.php +++ b/application/views/editOldemployee.php @@ -46,7 +46,7 @@ if(!empty($userRecords))

-
Employee details
+
Siddharth Industries - Edit Employee details

@@ -55,7 +55,7 @@ if(!empty($userRecords))
- Back + Back

@@ -202,8 +202,8 @@ if(!empty($userRecords))
- - + +
diff --git a/application/views/editSupplier.php b/application/views/editSupplier.php index 012898c1..a07a6665 100755 --- a/application/views/editSupplier.php +++ b/application/views/editSupplier.php @@ -321,7 +321,7 @@ function onlyAlphabets(evt) {

-
Siddharth Industries - DETAILS
+
Siddharth Industries - Edit DETAILS

@@ -346,7 +346,7 @@ function onlyAlphabets(evt) {

-
+
Supplier Information @@ -505,16 +505,12 @@ function onlyAlphabets(evt) { } ?> -
-
-
-
- +
+
+
+
-
-
-
diff --git a/application/views/rawmaterialListing.php b/application/views/rawmaterialListing.php index 3dbb3f67..c0f6f30f 100755 --- a/application/views/rawmaterialListing.php +++ b/application/views/rawmaterialListing.php @@ -1,9 +1,4 @@ - +
diff --git a/application/views/supplierListing.php b/application/views/supplierListing.php index 8462017e..73cafa7f 100755 --- a/application/views/supplierListing.php +++ b/application/views/supplierListing.php @@ -1,9 +1,4 @@ - +
@@ -16,8 +11,8 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
- Add New Supplier - Export supplier details + Add New Supplier + Export supplier details
diff --git a/application/views/users.php b/application/views/users.php index 78b16d97..79d14faa 100755 --- a/application/views/users.php +++ b/application/views/users.php @@ -12,7 +12,7 @@
- Add New + Add New User