ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed query for asset/license header boxes

Browse Source
This commit is contained in:
snipe
2013-11-20 04:31:40 -05:00
parent 781deb2551
commit c93469c465
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/models/Asset.php
+11 -3
View File
@@ -79,7 +79,11 @@ class Asset extends Elegant {
*/
public static function assetcount()
{
return Asset::where('physical', '==', 1)->count();
return DB::table('assets')
->where('physical', '=', '1')
->whereNull('deleted_at','and')
->count();
}
/**
@@ -87,9 +91,13 @@ class Asset extends Elegant {
*/
public static function availassetcount()
{
return Asset::where('assigned_to', '==', 0)->count();
return DB::table('assets')
->where('physical', '=', '1')
->where('assigned_to', '=', '0')
->whereNull('deleted_at','and')
->count();
}
}
app/models/License.php
+10 -2
View File
@@ -50,7 +50,10 @@ class License extends Elegant {
*/
public static function assetcount()
{
return Asset::where('physical', '==', 1)->count();
return DB::table('assets')
->where('physical', '=', '0')
->whereNull('deleted_at','and')
->count();
}
/**
@@ -58,7 +61,12 @@ class License extends Elegant {
*/
public static function availassetcount()
{
return Asset::where('assigned_to', '==', 0)->count();
return DB::table('assets')
->where('physical', '=', '0')
->where('assigned_to', '=', '0')
->whereNull('deleted_at','and')
->count();
}
app/views/backend/layouts/default.blade.php
+2 -2
View File
@@ -221,7 +221,7 @@
<div class="span3 stat">
<div class="data">
<span class="number">{{ number_format(License::assetcount()) }}</span>
licenses
total licenses
</div>
<span class="date">(placeholder)</span>
</div>
@@ -229,7 +229,7 @@
<div class="span3 stat last">
<div class="data">
<span class="number">{{ number_format(License::availassetcount()) }}</span>
people
licenses available
</div>
<span class="date">(placeholder)</span>
</div>