diff --git a/application/controllers/CostCenter.php b/application/controllers/CostCenter.php index f6586729..f703de53 100644 --- a/application/controllers/CostCenter.php +++ b/application/controllers/CostCenter.php @@ -68,7 +68,7 @@ class CostCenter extends BaseController $this->loadViews("addcost", $this->global, NULL); } - + /** * This function is used to add new Cost to the system */ diff --git a/application/views/addasset.php b/application/views/addasset.php index fab4c8e3..0d28a9e4 100644 --- a/application/views/addasset.php +++ b/application/views/addasset.php @@ -10,13 +10,7 @@ $(function() { var mindt = year-70; var maxdt = year-15; - $("#DateOfCreated").datepicker({ - minDate : new Date(mindt,1,1), - maxDate : 'now', - dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0' - - -}); + $("#DateOfCommission").datepicker({ minDate : new Date(year-SIAStartYear,1,1), maxDate :'now', @@ -68,17 +62,7 @@ $(function() {
-
-
-
-
- Asset Code - -
-
- -
- +
@@ -91,7 +75,7 @@ $(function() { -
+
Description @@ -174,13 +158,7 @@ $(function() {
-
-
- Created Date - - -
-
+
@@ -190,14 +168,7 @@ $(function() {
-
-
- Created By - - -
- -
+
Asset Status diff --git a/application/views/addcost.php b/application/views/addcost.php index f0340462..9cd17188 100644 --- a/application/views/addcost.php +++ b/application/views/addcost.php @@ -10,7 +10,7 @@

diff --git a/application/views/assetListing.php b/application/views/assetListing.php index ef2e1030..15eddd61 100644 --- a/application/views/assetListing.php +++ b/application/views/assetListing.php @@ -1,8 +1,19 @@ + +

-
ASSET LIST
+
Siddharth industries Asset Details

@@ -18,8 +29,7 @@
-

Asset List

-
+

@@ -28,9 +38,10 @@
-

+
+
-
+
diff --git a/application/views/costListing.php b/application/views/costListing.php index d6918ca4..11852e3a 100644 --- a/application/views/costListing.php +++ b/application/views/costListing.php @@ -10,7 +10,7 @@ diff --git a/application/views/editOldasset.php b/application/views/editOldasset.php index 79d48e81..fa240a66 100644 --- a/application/views/editOldasset.php +++ b/application/views/editOldasset.php @@ -11,7 +11,7 @@ $DateOfPurchase = ''; $DateOfCommission = ''; $AssetValue = ''; $Createdby = ''; - +$Remarks =''; if(!empty($asset)) @@ -29,7 +29,7 @@ if(!empty($asset)) $DateOfCommission = $uf->DateOfCommission; $Createdby = $uf->Createdby; $AssetValue = $uf->AssetValue; - + $Remarks = $uf->Remarks; } } @@ -46,7 +46,7 @@ function demo(){

-
Asset Details
+
Edit Asset Details

@@ -64,47 +64,45 @@ function demo(){
-
-

Edit Asset Details

-
+ -
+ +
-
-
+
+
- - - - + Asset Name +
-
+ + +
- - + Description +
- - -
+
- + Department + Location +
-
+
- - + Asset Owner +
-
+
- + Supplier Name -
-
+
- - max= value="" class="form-control" placeholder="" /> + Date Of Purchase +
-
+
- - max= value="" class="form-control" placeholder="" /> + Date Of Commission +
-
+ + +
- - - + Asset Value + +
-
+ +
+
+ Asset Status + +
+
+ +
+
+ Remarks + + +
+ +
+
+ IsActive +
+
diff --git a/application/views/viewasset.php b/application/views/viewasset.php index ae78ea1d..0d761571 100644 --- a/application/views/viewasset.php +++ b/application/views/viewasset.php @@ -49,7 +49,7 @@ function demo(){

-
Asset Details
+
View Asset Details

@@ -61,18 +61,12 @@ function demo(){
-
- - - - +
-
-

View Asset Details

-
+ - +
Asset Code
@@ -113,7 +107,7 @@ function demo(){ - + @@ -131,18 +125,12 @@ function demo(){ - - - - + - - - - + @@ -150,43 +138,10 @@ function demo(){
- - - -
-
-
- load->helper('form'); - $error = $this->session->flashdata('error'); - if($error) - { - ?> -
- - session->flashdata('error'); ?> -
- - session->flashdata('success'); - if($success) - { - ?> -
- - session->flashdata('success'); ?> -
- - -
-
- ', '
'); ?> -
+
+