Merge branch 'refs/heads/develop'

snipe · Nov 20, 2013 · 11a6ee5 · 11a6ee5
2 parents c251222 + 549c0a9
commit 11a6ee5
Show file tree

Hide file tree

Showing 11 changed files with 75 additions and 561 deletions.
diff --git a/app/controllers/BlogController.php b/app/controllers/BlogController.php
diff --git a/app/controllers/admin/BlogsController.php b/app/controllers/admin/BlogsController.php
diff --git a/app/lang/en/admin/blogs/message.php b/app/lang/en/admin/blogs/message.php
diff --git a/app/lang/en/admin/blogs/table.php b/app/lang/en/admin/blogs/table.php
diff --git a/app/models/Asset.php b/app/models/Asset.php
@@ -74,6 +74,30 @@ public function adminuser()
 		return $this->belongsTo('User','id');
 	}
 
+	/**
+	* Get total assets
+	*/
+	 public static function assetcount()
+	{
+		return DB::table('assets')
+
+                    ->where('physical', '=', '1')
+                    ->whereNull('deleted_at','and')
+                    ->count();
+	}
+
+	/**
+	* Get total assets not checked out
+	*/
+	 public static function availassetcount()
+	{
+		return DB::table('assets')
+                    ->where('physical', '=', '1')
+                    ->where('assigned_to', '=', '0')
+                    ->whereNull('deleted_at','and')
+                    ->count();
+
+	}
 
 
 }
diff --git a/app/models/License.php b/app/models/License.php
@@ -45,5 +45,30 @@ public function adminuser()
 		return $this->belongsTo('User','id');
 	}
 
+	/**
+	* Get total licenses
+	*/
+	 public static function assetcount()
+	{
+		return DB::table('assets')
+                    ->where('physical', '=', '0')
+                    ->whereNull('deleted_at','and')
+                    ->count();
+	}
+
+	/**
+	* Get total licenses not checked out
+	*/
+	 public static function availassetcount()
+	{
+		return DB::table('assets')
+                    ->where('physical', '=', '0')
+                    ->where('assigned_to', '=', '0')
+                    ->whereNull('deleted_at','and')
+                    ->count();
+
+	}
+
+
 
 }