-
Notifications
You must be signed in to change notification settings - Fork 3
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Unverified Buyer List #186
base: develop
Are you sure you want to change the base?
Conversation
List of unverified buyers now show to admin user. Admin user can now update status of a buyer.
@@ -1,8 +1,9 @@ | |||
angular.module('jasmic.controllers') | |||
.controller('AdministratorCtrl', ['$scope','$mdDialog', '$mdToast','UsersFactory','CropsFactory','SuppliersFactory', | |||
.controller('AdministratorCtrl', ['$scope','$mdDialog', '$mdToast','$window','UsersFactory','CropsFactory','SuppliersFactory', | |||
'UserFactory','CropFactory','SupplierFactory', 'EmailFactory', 'UserProfileFactory', 'ParishesFactory', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@matjames007 I encountered an issue after updating a buyer. The screen would turn grey but the dialog box was not seen. In testing the branch, you can remove the $window.scroll line to see if you get encounter this behaviour.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't seen the behaviour described. I also haven't seen the $window.scroll
line u mentioned. Could you point me to the file and line number on this branch?
@@ -236,6 +264,7 @@ angular.module('jasmic.controllers') | |||
*/ | |||
function updateSupplier(){ | |||
SupplierFactory.update({id:$scope.supplier._id}, $scope.supplier, function(success){ | |||
$window.scrollTo(0,0); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@matjames007 here's the reference to the line.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh when u are updating the supplier! not the buyer...lol ok
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@matjames007 actually both! lol..
…re properly. Now the issue is that the parent is usually the body element and it will always try to centre relative to the top of the page. So the best way to centre is based on the object being manipulated. I wrote code to pull the item being manipulated and set as dialog parent. Achieved by using an overloaded function. Matthew Budram
Conflicts: public/javascripts/controllers/admin-ctrl.js
…roots/jas-mis-app into unverified-buyer-list-impl
Conflicts: public/javascripts/controllers/admin-ctrl.js
List of unverified buyers now show to admin user. Admin user can now update status of a buyer.