Skip to content

Commit

Permalink
Resized pendicon and staticon containers as requested
Browse files Browse the repository at this point in the history
  • Loading branch information
@jongravois
jongravois committed Jun 23, 2015
1 parent b4ea0a1 commit 76431f2
Show file tree
Hide file tree
Showing 4 changed files with 117 additions and 139 deletions.
12 changes: 6 additions & 6 deletions app/database/seeds/CommitteeTableSeeder.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@ public function run()
'loan_id' => 1,
'role_id' => 4,
'user_id' => 5,
'vote_status' => 'pending',
'vote_status' => 'voted',
'vote' => 1,
'vote_request_date' => '2014-09-11',
'committee_role' => 'Branch Manager'
'vote_received_date' => '2014-09-12',
'committee_role' => 'Branch Manager'

]);
Committee::create([
'loan_id' => 1,
'role_id' => 3,
'user_id' => 2,
'vote_status' => 'voted',
'vote' => 1,
'vote_status' => 'pending',
'vote_request_date' => '2014-09-11',
'vote_received_date' => '2014-09-12',
'committee_role' => 'Tester'
'committee_role' => 'Tester'
]);
}
}
216 changes: 109 additions & 107 deletions app/database/seeds/NotificationTableSeeder.php
View file
Original file line number Diff line number Diff line change
@@ -1,111 +1,113 @@
<?php

class NotificationTableSeeder extends Seeder {

public function run()
{
Notification::create([
'user_id' => 2,
'loan_id' => 1,
'notification_type' => 'report',
'report_id' => 1,
'task' => 'Confirm Activity Detail Report'
]);

Notification::create([
'user_id' => 2,
'loan_id' => 1,
'report_id' => 2,
'notification_type' => 'report',
'task' => 'Confirm Customer Budget Report'
]);

Notification::create([
'user_id' => 2,
'loan_id' => 1,
'report_id' => 3,
'notification_type' => 'report',
'task' => 'Confirm Account Reconciliation Report'
]);

Notification::create([
'user_id' => 2,
'loan_id' => 1,
'report_id' => 9,
'notification_type' => 'report',
'task' => 'Confirm Crop Mix Report'
]);

Notification::create([
'user_id' => 8,
'loan_id' => 1,
'notification_type' => 'report',
'report_id' => 1,
'task' => 'Confirm Activity Detail Report'
]);

Notification::create([
'user_id' => 8,
'loan_id' => 1,
'report_id' => 2,
'notification_type' => 'report',
'task' => 'Confirm Customer Budget Report'
]);

Notification::create([
'user_id' => 8,
'loan_id' => 1,
'report_id' => 3,
'notification_type' => 'report',
'task' => 'Confirm Account Reconciliation Report'
]);

Notification::create([
'user_id' => 8,
'loan_id' => 1,
'report_id' => 9,
'notification_type' => 'report',
'task' => 'Confirm Crop Mix Report'
]);

Notification::create([
'user_id' => 2,
'loan_id' => 1,
'notification_type' => 'vote',
'task' => 'Review Loan: Tony Stark - Glass Towers'
]);

Notification::create([
'user_id' => 2,
'loan_id' => 5,
'notification_type' => 'vote',
'task' => 'Review Loan: Clint Barton - Nested Row'
]);

Notification::create([
'user_id' => 2,
'notification_type' => 'office',
'task' => 'Staff Meeting on Wednesday, Dec. 10, 2014',
'status' => 'acknowledged'
]);

Notification::create([
'user_id' => 8,
'notification_type' => 'office',
'task' => 'Review Site'
]);

Notification::create([
'user_id' => 8,
'notification_type' => 'office',
'task' => 'Report Progress'
]);

Notification::create([
'user_id' => 8,
'notification_type' => 'office',
'task' => 'Enjoy life!'
]);
}
class NotificationTableSeeder extends Seeder
{

public function run()
{
Notification::create([
'user_id' => 2,
'loan_id' => 1,
'notification_type' => 'report',
'report_id' => 1,
'task' => 'Confirm Activity Detail Report'
]);

Notification::create([
'user_id' => 2,
'loan_id' => 1,
'report_id' => 2,
'notification_type' => 'report',
'task' => 'Confirm Customer Budget Report'
]);

Notification::create([
'user_id' => 2,
'loan_id' => 1,
'report_id' => 3,
'notification_type' => 'report',
'task' => 'Confirm Account Reconciliation Report'
]);

Notification::create([
'user_id' => 2,
'loan_id' => 1,
'report_id' => 9,
'notification_type' => 'report',
'task' => 'Confirm Crop Mix Report'
]);

Notification::create([
'user_id' => 8,
'loan_id' => 1,
'notification_type' => 'report',
'report_id' => 1,
'task' => 'Confirm Activity Detail Report'
]);

Notification::create([
'user_id' => 8,
'loan_id' => 1,
'report_id' => 2,
'notification_type' => 'report',
'task' => 'Confirm Customer Budget Report'
]);

Notification::create([
'user_id' => 8,
'loan_id' => 1,
'report_id' => 3,
'notification_type' => 'report',
'task' => 'Confirm Account Reconciliation Report'
]);

Notification::create([
'user_id' => 8,
'loan_id' => 1,
'report_id' => 9,
'notification_type' => 'report',
'task' => 'Confirm Crop Mix Report'
]);

Notification::create([
'user_id' => 2,
'loan_id' => 1,
'notification_type' => 'vote',
'task' => 'Review Loan: Tony Stark - Glass Towers'
]);

Notification::create([
'user_id' => 2,
'loan_id' => 5,
'notification_type' => 'vote',
'task' => 'Review Loan: Clint Barton - Nested Row',
'status' => 'acknowledged'
]);

Notification::create([
'user_id' => 2,
'notification_type' => 'office',
'task' => 'Staff Meeting on Wednesday, Dec. 10, 2014',
'status' => 'acknowledged'
]);

Notification::create([
'user_id' => 8,
'notification_type' => 'office',
'task' => 'Review Site'
]);

Notification::create([
'user_id' => 8,
'notification_type' => 'office',
'task' => 'Report Progress'
]);

Notification::create([
'user_id' => 8,
'notification_type' => 'office',
'task' => 'Enjoy life!'
]);
}

}
26 changes: 1 addition & 25 deletions public/angular/layout/topbars/loanProgress.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,44 +6,33 @@
tooltip-placement="bottom"
class="progicon glyphicon glyphicon-exclamation-sign"
ng-class="{'cBlue': loan.need_vote, 'cGray': !loan.need_vote}"></span>
</td>
<td>
<span tooltip="Comments"
tooltip-append-to-body="true"
tooltip-placement="bottom"
class="progicon glyphicon glyphicon-exclamation-sign"
ng-class="{'cYellow': loan.has_comment, 'cGray': !loan.has_comment}"></span>
</td>
<td>
<span tooltip="Stale Application"
tooltip-append-to-body="true"
tooltip-placement="bottom"
class="progicon glyphicon glyphicon-exclamation-sign"
ng-class="{'cRed': loan.is_stale, 'cGray': !loan.is_stale}"></span>
</td>
<td>
<span tooltip="WatchList"
tooltip-append-to-body="true"
tooltip-placement="bottom"
class="progicon glyphicon glyphicon-sunglasses"
ng-class="{'cBlack': loan.is_watched, 'cGray': !loan.is_watched}"></span>
</td>
<td>
<span tooltip="Disbursement"
tooltip-append-to-body="true"
tooltip-placement="bottom"
class="progicon glyphicon glyphicon-usd"
ng-class="{'cGreen': loan.disbursement_issue, 'cGray': !loan.disbursement_issue}"></span>
</td>
<td colspan="3">&nbsp;</td>
<td>
<span class="progicon glyphicon glyphicon-plus"
tooltip="Addendum"
tooltip-append-to-body="true"
tooltip-placement="bottom"
ng-class="{'clrOn': loan.has_addendum, 'clrOff': !loan.has_addendum}"></span>
</td>
<td>
<span class="progicon glyphicon glyphicon-random"
tooltip="Cross Collateral"
tooltip-append-to-body="true"
Expand All @@ -56,43 +45,32 @@
tooltip-placement="bottom"
ng-click="toggleCrossColateral()"
ng-class="{'cRed': XColView, 'clrOn': loan.is_cross_collateralized, 'clrOff': !loan.is_cross_collateralized }" style="color: #333333;" ng-if="!XColView"></span>
</td>
<td>
<span class="progicon glyphicon glyphicon-fire"
tooltip="Bankruptcy History"
tooltip-append-to-body="true"
tooltip-placement="bottom"
ng-class="{'clrOn': loan.bankruptcy_history, 'clrOff': !loan.bankruptcy_history}"></span>
</td>
<td>
<span class="progicon glyphicon glyphicon-stats"
tooltip="Third Party Credit Required"
tooltip-append-to-body="true"
tooltip-placement="bottom"
ng-class="{'clrOn': loan.required_3party, 'clrOff': !loan.required_3party}"></span>
</td>
<td>
<span class="progicon glyphicon glyphicon-flag"
tooltip="Added Land in Database"
tooltip-append-to-body="true"
tooltip-placement="bottom"
ng-class="{'clrOn': loan.added_land, 'clrOff': !loan.added_land}"></span>
</td>
<td>
<span class="progicon glyphicon glyphicon-lock"
tooltip="Controlled Disbursement"
tooltip-append-to-body="true"
tooltip-placement="bottom"
ng-class="{'clrOn': loan.controlled_disbursement, 'clrOff': !loan.controlled_disbursement}"></span>
</td>
<td>
<span class="progicon glyphicon glyphicon-paperclip"
tooltip="Attachments"
tooltip-append-to-body="true"
tooltip-placement="bottom"
ng-class="{'clrOn' : loan.attachments.length, 'clrOff': !loan.attachments.length }"></span>
</td>
<td colspan="3">&nbsp;</td>
<td>
<span class="progicon glyphicon glyphicon-list-alt"
tooltip="ITS List Verfified"
Expand Down Expand Up @@ -258,9 +236,7 @@
<td>
<span style="font-size:18px;">{{loan.account_classification}}</span>
</td>
<td>
&nbsp;
</td>
<td colspan="5">&nbsp;</td>
<td>
<span loan-status-icon status="loan.status_id"></span>
</td>
Expand Down
2 changes: 1 addition & 1 deletion public/angular/loans/services/app.factory.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@

var cheked = false;
_.each(committee, function(i){
if(Number(i.user_id) === Number(userID) && Number(i.user_id) === Number(loan.id) && i.vote_status === 'pending') {
if(Number(i.user_id) === Number(userID) && Number(i.loan_id) === Number(loan.id) && i.vote_status === 'pending') {
cheked = true;
}
});
Expand Down

0 comments on commit 76431f2

Please sign in to comment.