Merge pull request #195 from mifoscontributer/testing

Fixing group issues
openMF · Oct 19, 2013 · 2254664 · 2254664
2 parents 3a7ab13 + 50e55d1
commit 2254664
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/app/scripts/controllers/groups/CreateGroupController.js b/app/scripts/controllers/groups/CreateGroupController.js
@@ -6,7 +6,6 @@
             scope.data = {};
             scope.choice = 0;
             scope.first = {};
-            scope.first.date = new Date();
             resourceFactory.groupTemplateResource.get(function(data) {
                 scope.offices = data.officeOptions;
                 scope.staffs = data.staffOptions;

diff --git a/app/scripts/controllers/loanAccount/ViewLoanDetailsController.js b/app/scripts/controllers/loanAccount/ViewLoanDetailsController.js
@@ -248,10 +248,6 @@
 
       };
 
-      scope.unassignLoanOfficer = function () {
-
-      };
-
     }
   });
   mifosX.ng.application.controller('ViewLoanDetailsController', ['$scope', '$routeParams', 'ResourceFactory', '$location', '$route', mifosX.controllers.ViewLoanDetailsController]).run(function($log) {

diff --git a/app/views/accounting/view_transactions.html b/app/views/accounting/view_transactions.html
@@ -1,4 +1,10 @@
 <form ng-controller="ViewTransactionController">
+    <div>
+        <ul class="breadcrumb">
+          <li><a href="#/accounting">{{'link.accounting' | translate}}</a> <span class="divider">/</span></li>
+          <li class="active">{{'label.view.transaction' | translate}}</li>
+        </ul>
+      </div>
     <div class="row alert-block span" >
         <h3>{{ 'label.journalentry.transaction.number' | translate }}&nbsp;<b>{{transactionNumber}}</b></h3>
         <div class="pull-right">

diff --git a/app/views/clients/viewclient.html b/app/views/clients/viewclient.html
@@ -64,7 +64,7 @@ <h3>
                             <tr>
                               <td>{{ 'label.memberof' | translate }}</td>
                               <td>
-                                <span ng-repeat="group in client.groups" > {{group.name}} |&nbsp;</span>
+                                <span ng-repeat="group in client.groups" > <a href="#/viewgroup/{{group.id}}">{{group.name}}</a> |&nbsp;</span>
                               </td>
                             </tr>
                           </table>

diff --git a/app/views/groups/editgroup.html b/app/views/groups/editgroup.html
@@ -22,11 +22,13 @@
                         <input type="text" id="externalid"  ng-model="formData.externalId">
                     </div>
                 </div>
-                <div class="control-group">
-                    <label class="control-label">{{'label.form.activationdate' | translate}}</label>
-                    <div class="controls">
-                        <input type="text" datepicker-pop="dd MMMM yyyy" ng-model="first.date" is-open="opened" min="minDate" max="'2020-06-22'" date-disabled="disabled(date, mode)" required late-Validate />
-                    </div>
+                <div ng-hide="editGroup.status.value == 'Pending'">
+                    <div class="control-group">
+                        <label class="control-label">{{'label.form.activationdate' | translate}}</label>
+                        <div class="controls">
+                            <input type="text" datepicker-pop="dd MMMM yyyy" ng-model="first.date" is-open="opened" min="minDate" max="'2020-06-22'" date-disabled="disabled(date, mode)" required late-Validate />
+                        </div>
+                    </div>                    
                 </div>
                 <div class="offset">
                     <a href="#/viewgroup/{{editGroup.id}}" class="btn">{{'label.cancel' | translate}}</a>