Commit 9673dd61 authored by EXT Hélène David's avatar EXT Hélène David
Browse files

Merge branch 'master' of...

Merge branch 'master' of gricad-gitlab.univ-grenoble-alpes.fr:edcampus/edcampus-front into EDCAMPUS-56-afficher-les-offres-demploi
parents 7e361636 358a17bf
...@@ -158,7 +158,8 @@ root.controller('AdminCompaniesCtrl' ,['$scope','$http','$stateParams', '$univer ...@@ -158,7 +158,8 @@ root.controller('AdminCompaniesCtrl' ,['$scope','$http','$stateParams', '$univer
}) })
} }
adminCompaniesCtrl.newCompany = function (company){ adminCompaniesCtrl.newCompany = function (){
var company = adminCompaniesCtrl.inputCompany;
var index = $scope._arrayObjectIndexOf(adminCompaniesCtrl.companyList,company,"fullName"); var index = $scope._arrayObjectIndexOf(adminCompaniesCtrl.companyList,company,"fullName");
var type = adminCompaniesCtrl.currentScreen; var type = adminCompaniesCtrl.currentScreen;
if(index>-1){ if(index>-1){
...@@ -203,11 +204,19 @@ root.controller('AdminCompaniesCtrl' ,['$scope','$http','$stateParams', '$univer ...@@ -203,11 +204,19 @@ root.controller('AdminCompaniesCtrl' ,['$scope','$http','$stateParams', '$univer
$companyFactory.getCompanyDetails(adminCompaniesCtrl.entrepriseId, adminCompaniesCtrl.campus.id, function(data){ $companyFactory.getCompanyDetails(adminCompaniesCtrl.entrepriseId, adminCompaniesCtrl.campus.id, function(data){
if(data.status == "success"){ if(data.status == "success"){
adminCompaniesCtrl.company = data.details; adminCompaniesCtrl.company = data.details;
$companyFactory.getEntrepriseMetas(adminCompaniesCtrl.entrepriseId, adminCompaniesCtrl.campus.id, function(data){
if(data.status == "success"){
adminCompaniesCtrl.company = $.extend(adminCompaniesCtrl.company, data.details.metas);
}
})
} }
else{ else{
} }
}) })
} }
adminCompaniesCtrl.sortCompanies = function(){ adminCompaniesCtrl.sortCompanies = function(){
...@@ -243,9 +252,8 @@ root.controller('AdminCompaniesCtrl' ,['$scope','$http','$stateParams', '$univer ...@@ -243,9 +252,8 @@ root.controller('AdminCompaniesCtrl' ,['$scope','$http','$stateParams', '$univer
} }
adminCompaniesCtrl.updateCompany = function(company){ adminCompaniesCtrl.updateCompany = function(){
console.log(company); $companyFactory.setCompanyMainFields(adminCompaniesCtrl.company,function(data){
$companyFactory.setCompanyMainFields(company,function(data){
if(data.status == "success"){ if(data.status == "success"){
adminCompaniesCtrl.getCompanyDetails(); adminCompaniesCtrl.getCompanyDetails();
} }
......
...@@ -2,12 +2,37 @@ ...@@ -2,12 +2,37 @@
/* Controllers */ /* Controllers */
root.controller('UnivCompanyContacts' ,['$scope','$http','$stateParams','$contactFactory', function($scope,$http,$stateParams,$contactFactory) { root.controller('UnivCompanyContacts' ,['$scope','$http','$stateParams', '$contactFactory', '$universityFactory', function($scope,$http, $stateParams,$contactFactory, $universityFactory) {
$scope.contacts = {elements:[]};
if(!$scope.entrepriseId) $scope.entrepriseId = $stateParams.entrepriseId;
$scope.newElement = {organization:$scope.company.fullName};
$scope.init = function(){
$scope.contacts = {elements:[]};
$scope.entrepriseId = $stateParams.entrepriseId;
$scope.getUnivs();
}
$scope.refresh = function(){
$scope.getContacts();
}
$scope.getUnivs = function(){
var session = $scope._getSession();
$universityFactory.get_userCampus(session.user,function(data){
$scope.ready = true;
if(data.status == "success"){
$scope.campuses = data.details;
for(var index in data.details){
var campus = data.details[index]
if(campus.status=="1"){
$scope.campus = {"id":campus.id,"settings":{},"articles":{},name:campus.name,ownerId:campus.ownerId};
$scope.refresh();
break;
}
}
}
});
};
$scope.getStatus = function(){ $scope.getStatus = function(){
$contactFactory.getContactAllStatus(function(data){ $contactFactory.getContactAllStatus(function(data){
...@@ -28,31 +53,23 @@ root.controller('UnivCompanyContacts' ,['$scope','$http','$stateParams','$contac ...@@ -28,31 +53,23 @@ root.controller('UnivCompanyContacts' ,['$scope','$http','$stateParams','$contac
} }
$scope.getContacts = function (){ $scope.getContacts = function (){
$scope._log("get contacts");
$scope.contacts.elements = [];
$contactFactory.getUniversityEntrepriseContacts($scope.campus.id, $scope.entrepriseId,function(data){
$scope._log("get contacts"); if(data.status == "success"){
$scope.contacts.elements = data.details;
var session = $scope._getSession(); var i;
for(i=0;i<$scope.contacts.elements.length;i++){
$scope.contacts.elements = []; if($scope.contacts.elements[i].params) $scope.contacts.elements[i].params = JSON.parse($scope.contacts.elements[i].params)
}
$contactFactory.getUniversityEntrepriseContacts($scope.campus.id, $scope.entrepriseId,function(data){
if(data.status == "success"){
$scope.contacts.elements = data.details;
var i;
for(i=0;i<$scope.contacts.elements.length;i++){
if($scope.contacts.elements[i].params) $scope.contacts.elements[i].params = JSON.parse($scope.contacts.elements[i].params)
}
}
})
}
})
} }
$scope.addContact = function(){
var session = $scope._getSession();
$contactFactory.addUniversityEntrepriseContact($scope.campus.id, $scope.entrepriseId,$scope.newElement,function(data){
$scope.addContact = function(){
$contactFactory.addUniversityEntrepriseContact($scope.campus.id, $scope.entrepriseId, $scope.newElement,function(data){
if(data.status == "success"){ if(data.status == "success"){
$scope.getContacts(); $scope.getContacts();
$scope.currentSection='listContacts'; $scope.currentSection='listContacts';
...@@ -63,7 +80,6 @@ root.controller('UnivCompanyContacts' ,['$scope','$http','$stateParams','$contac ...@@ -63,7 +80,6 @@ root.controller('UnivCompanyContacts' ,['$scope','$http','$stateParams','$contac
}) })
} }
$scope.getStatus();
$scope.getContacts(); $scope.init();
}]); }]);
\ No newline at end of file
...@@ -2,16 +2,16 @@ ...@@ -2,16 +2,16 @@
/* Controllers */ /* Controllers */
root.controller('AdminCompaniesDetailsCtrl' ,['$scope','$http','$stateParams', '$companyFactory','$languageFactory', function($scope,$http,$stateParams,$companyFactory,$languageFactory) { root.controller('AdminCompaniesDetailsCtrl' ,['$scope','$http','$stateParams', '$companyFactory','$languageFactory','$universityFactory', function($scope,$http,$stateParams,$companyFactory,$languageFactory,$universityFactory) {
$scope.currentElement = null; $scope.currentElement = null;
$scope.newField = null; $scope.newFieldForm = false;
$scope.companyId = $stateParams.entrepriseId;
$scope.init = function(){ $scope.init = function(){
$companyFactory.getEntrepriseMetas($scope.entrepriseId,$scope.campus.id, function(data){ $companyFactory.getEntrepriseMetas($scope.companyId,$scope.campus.id, function(data){
$scope._showAlert({status:2,message:""}) $scope._showAlert({status:2,message:""})
if(data.status == "success"){ if(data.status == "success"){
$scope.metas = {}; $scope.metas = {};
...@@ -22,19 +22,21 @@ root.controller('AdminCompaniesDetailsCtrl' ,['$scope','$http','$stateParams', ' ...@@ -22,19 +22,21 @@ root.controller('AdminCompaniesDetailsCtrl' ,['$scope','$http','$stateParams', '
$scope.metas[key] = [{label:$languageFactory._labels[key],value:val,custom:false,key:key}]; $scope.metas[key] = [{label:$languageFactory._labels[key],value:val,custom:false,key:key}];
} }
for(var key in $scope.rawMetas.customMetas.metas){ if($scope.rawMetas.customMetas) {
var label = ""; for(var key in $scope.rawMetas.customMetas.metas){
if($languageFactory._labels.hasOwnProperty(key)) label = $languageFactory._labels[key]; var label = "";
else if($scope.rawMetas.customMetas.fields.hasOwnProperty(key)) label = $scope.rawMetas.customMetas.fields[key].label; if($languageFactory._labels.hasOwnProperty(key)) label = $languageFactory._labels[key];
if(label){ else if($scope.rawMetas.customMetas.fields.hasOwnProperty(key)) label = $scope.rawMetas.customMetas.fields[key].label;
else label = key;
var val = $scope.rawMetas.customMetas.metas[key][0].value; if(label){
if(!val) val= $languageFactory._labels.undefined; var val = $scope.rawMetas.customMetas.metas[key][0].value;
var elem = {value:val,label:label,custom:true,key:key,id:$scope.rawMetas.customMetas.metas[key][0].id,visibility:$scope.rawMetas.customMetas.metas[key][0].visibility,count:$scope.rawMetas.customMetas.metas[key].length}; if(!val) val= $languageFactory._labels.undefined;
if(!$scope.metas.hasOwnProperty(key)) $scope.metas[key] = []; var elem = {value:val,label:label,custom:true,key:key,id:$scope.rawMetas.customMetas.metas[key][0].id,visibility:$scope.rawMetas.customMetas.metas[key][0].visibility,count:$scope.rawMetas.customMetas.metas[key].length};
console.log(key,$scope.rawMetas.customMetas.metas[key],$scope.rawMetas.customMetas.fields); if(!$scope.metas.hasOwnProperty(key)) $scope.metas[key] = [];
console.log(key,$scope.rawMetas.customMetas.metas[key],$scope.rawMetas.customMetas.fields);
$scope.metas[key].unshift(elem);
$scope.metas[key].unshift(elem);
}
} }
} }
...@@ -45,7 +47,8 @@ root.controller('AdminCompaniesDetailsCtrl' ,['$scope','$http','$stateParams', ' ...@@ -45,7 +47,8 @@ root.controller('AdminCompaniesDetailsCtrl' ,['$scope','$http','$stateParams', '
$scope._showAlert({status:3,message:""}) $scope._showAlert({status:3,message:""})
} }
}); });
} }
...@@ -54,7 +57,7 @@ root.controller('AdminCompaniesDetailsCtrl' ,['$scope','$http','$stateParams', ' ...@@ -54,7 +57,7 @@ root.controller('AdminCompaniesDetailsCtrl' ,['$scope','$http','$stateParams', '
} }
$scope.setField = function(element){ $scope.setField = function(element){
$companyFactory.setEntrepriseField($scope.entrepriseId, $scope.campus.id, element, function(data){ $companyFactory.setEntrepriseField($scope.companyId, $scope.campus.id, element, function(data){
if(data.status == "success"){ if(data.status == "success"){
$scope.init(); $scope.init();
$scope.setCurrentElement(null); $scope.setCurrentElement(null);
...@@ -63,21 +66,12 @@ root.controller('AdminCompaniesDetailsCtrl' ,['$scope','$http','$stateParams', ' ...@@ -63,21 +66,12 @@ root.controller('AdminCompaniesDetailsCtrl' ,['$scope','$http','$stateParams', '
} }
$scope.showNewField = function(){
$scope.newField = {};
}
$scope.hideNewField = function(){
$scope.newField =null;
}
$scope.submitNewField = function(){ $scope.submitNewField = function(){
console.log($scope.newField); console.log($scope.newField);
$companyFactory.setEntrepriseField($scope.entrepriseId, $scope.campus.id, $scope.newField, function(data){ $companyFactory.setEntrepriseField($scope.companyId, $scope.campus.id, $scope.newField, function(data){
if(data.status == "success"){ if(data.status == "success"){
$scope.init(); $scope.init();
$scope.hideNewField(); $scope.newField = null;
$scope.setCurrentElement(null); $scope.setCurrentElement(null);
} }
}); });
...@@ -97,8 +91,27 @@ root.controller('AdminCompaniesDetailsCtrl' ,['$scope','$http','$stateParams', ' ...@@ -97,8 +91,27 @@ root.controller('AdminCompaniesDetailsCtrl' ,['$scope','$http','$stateParams', '
element.value = ""; element.value = "";
$scope.setField(element); $scope.setField(element);
} }
$scope.getUnivs = function(){
var session = $scope._getSession();
$universityFactory.getUniversitiesByUser(session.user, function(data){
$scope.ready = true;
if(data.status == "success"){
$scope.campuses =data.details;
for(var index in data.details){
var campus = data.details[index]
if(campus.status=="1"){
$scope.campus = {"id":campus.id,"settings":{},"articles":{},name:campus.name,ownerId:campus.ownerId};
$scope.init();
break;
}
}
}
})
}
$scope.init(); $scope.getUnivs();
}]); }]);
\ No newline at end of file
...@@ -2,12 +2,17 @@ ...@@ -2,12 +2,17 @@
/* Controllers */ /* Controllers */
root.controller('AdminCompaniesNotesCtrl' ,['$scope','$http','$stateParams','$companyFactory', function($scope,$http,$stateParams,$companyFactory) { root.controller('AdminCompaniesNotesCtrl' ,['$scope','$http','$stateParams','$companyFactory', '$universityFactory', function($scope,$http,$stateParams,$companyFactory, $universityFactory) {
$scope.newNote = {}; $scope.newNote = {};
$scope.init = function(){ $scope.init = function(){
$companyFactory.getUniversityEntrepriseNotes($scope.entrepriseId,$scope.campus.id, function(data){ $scope.entrepriseId = $stateParams.entrepriseId;
$scope.getUnivs();
}
$scope.getNotes = function(){
$companyFactory.getUniversityEntrepriseNotes($scope.entrepriseId, $scope.campus.id, function(data){
if(data.status == "success"){ if(data.status == "success"){
$scope.notes = {elements:data.details}; $scope.notes = {elements:data.details};
} }
...@@ -15,11 +20,11 @@ root.controller('AdminCompaniesNotesCtrl' ,['$scope','$http','$stateParams','$co ...@@ -15,11 +20,11 @@ root.controller('AdminCompaniesNotesCtrl' ,['$scope','$http','$stateParams','$co
} }
}); });
}
}
$scope.addNote = function(note){ $scope.addNote = function(){
$companyFactory.getUniversityEntrepriseNotes($scope.entrepriseId,$scope.campus.id,note, function(data){ var note = $scope.newNote;
$companyFactory.addUniversityEntrepriseNote($scope.entrepriseId, $scope.campus.id, note, function(data){
if(data.status == "success"){ if(data.status == "success"){
$scope.init(); $scope.init();
...@@ -29,9 +34,29 @@ root.controller('AdminCompaniesNotesCtrl' ,['$scope','$http','$stateParams','$co ...@@ -29,9 +34,29 @@ root.controller('AdminCompaniesNotesCtrl' ,['$scope','$http','$stateParams','$co
} }
}); });
} }
$scope.refresh = function() {
$scope.getNotes();
}
$scope.getUnivs = function(){
var session = $scope._getSession();
$universityFactory.get_userCampus(session.user,function(data){
$scope.ready = true;
if(data.status == "success"){
$scope.campuses = data.details;
for(var index in data.details){
var campus = data.details[index]
if(campus.status=="1"){
$scope.campus = {"id":campus.id,"settings":{},"articles":{},name:campus.name,ownerId:campus.ownerId};
$scope.refresh();
break;
}
}
}
});
};
$scope.init(); $scope.init();
}]); }]);
\ No newline at end of file
<div ng-controller="AdminCompaniesDetailsCtrl as adminCompaniesDetailsCtrl"> <div ng-controller="AdminCompaniesDetailsCtrl as adminCompaniesDetailsCtrl">
<button style="position:absolute; right: 20px; top: 35px;" ng-click="adminCompaniesDetailsCtrl.showNewField();">{{::_labels.newFieldBtn}}</button> <button style="position:absolute; right: 20px; top: 35px;" ng-click="adminCompaniesDetailsCtrl.newFieldForm=true;">{{::_labels.newFieldBtn}}</button>
<div style="height:470px; overflow-y:auto;text-transform:initial;"> <div style="height:470px; overflow-y:auto;text-transform:initial;">
<div class="well" ng-if='adminCompaniesDetailsCtrl.newField'> <div class="well" ng-show='adminCompaniesDetailsCtrl.newFieldForm'>
<label>{{::_labels.newFieldLabel}}</label> <label>{{::_labels.newFieldLabel}}</label>
<input ng-model="adminCompaniesDetailsCtrl.newField.label" style="width:100%;"></input> <input ng-model="newField.label" style="width:100%;"></input>
<label>{{::_labels.newFieldValue}}</label> <label>{{::_labels.newFieldValue}}</label>
<input ng-model="adminCompaniesDetailsCtrl.newField.value" style="width:100%;"></input> <input ng-model="newField.value" style="width:100%;"></input>
<div style="font-size:0.9em;"> <div style="font-size:0.9em;">
<span><i class="fa fa-eye"></i>{{::_labels.visibility}}</span> <span><i class="fa fa-eye"></i>{{::_labels.visibility}}</span>
<select ng-model="adminCompaniesDetailsCtrl.newField.visibility" style="display:inline-block;"> <select ng-model="newField.visibility" style="display:inline-block;">
<option value="0" title="{{::_labels.publicFieldTooltip}}">{{::_labels.articleVisibilityList.public}}</option> <option value="0" title="{{::_labels.publicFieldTooltip}}">{{::_labels.articleVisibilityList.public}}</option>
<option value="1" title="{{::_labels.myselfFieldTooltip}}">{{::_labels.myself}}</option> <option value="1" title="{{::_labels.myselfFieldTooltip}}">{{::_labels.myself}}</option>
<option value="2" title="{{::_labels.myCampusFieldTooltip}}">{{::_labels.isMainCampus}}</option> <option value="2" title="{{::_labels.myCampusFieldTooltip}}">{{::_labels.isMainCampus}}</option>
</select> </select>
<span> <span>
<span ng-if="adminCompaniesDetailsCtrl.newField.visibility==0">{{::_labels.publicFieldTooltip}}</span> <span ng-if="newField.visibility==0">{{::_labels.publicFieldTooltip}}</span>
<span ng-if="adminCompaniesDetailsCtrl.newField.visibility==1">{{::_labels.myselfFieldTooltip}}</span> <span ng-if="newField.visibility==1">{{::_labels.myselfFieldTooltip}}</span>
<span ng-if="adminCompaniesDetailsCtrl.newField.visibility==2">{{::_labels.myCampusFieldTooltip}}</span> <span ng-if="newField.visibility==2">{{::_labels.myCampusFieldTooltip}}</span>
</span> </span>
</div> </div>
<button class="pull-right" ng-click="adminCompaniesDetailsCtrl.submitNewField();">{{::_labels.addBtn}}</button> <button class="pull-right" ng-click="submitNewField();adminCompaniesDetailsCtrl.newFieldForm=false;">{{::_labels.addBtn}}</button>
<button class="pull-right cancel" type="button" ng-click="adminCompaniesDetailsCtrl.hideNewField();">{{::_labels.cancelBtn}}</button> <button class="pull-right cancel" type="button" ng-click="adminCompaniesDetailsCtrl.newFieldForm=false;">{{::_labels.cancelBtn}}</button>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>
<section ng-repeat="(key, val) in adminCompaniesDetailsCtrl.metas" class="hoverableContent"> <section ng-repeat="(key, val) in metas" class="hoverableContent">
<div class="hoverable pull-right"> <div class="hoverable pull-right">
<span ng-if="val[0].custom" class="label label-warning"> <span ng-if="val[0].custom" class="label label-warning">
<span ng-if="val[0].visibility==0"><i class="fa fa-unlock"></i> {{::_labels.articleVisibilityList.public}}</span> <span ng-if="val[0].visibility==0"><i class="fa fa-unlock"></i> {{::_labels.articleVisibilityList.public}}</span>
<span ng-if="val[0].visibility==1"><i class="fa fa-lock"></i> {{::_labels.myself}}</span> <span ng-if="val[0].visibility==1"><i class="fa fa-lock"></i> {{::_labels.myself}}</span>
<span ng-if="val[0].visibility==2"><i class="fa fa-unlock-alt"></i> {{::_labels.isMainCampus}}</span> <span ng-if="val[0].visibility==2"><i class="fa fa-unlock-alt"></i> {{::_labels.isMainCampus}}</span>
$
</span> </span>
<button ng-click="adminCompaniesDetailsCtrl.setCurrentElement(key)" ng-if="adminCompaniesDetailsCtrl.currentElement!=key" style="margin-left: 5px;"><i class="fa fa-edit"></i> {{::_labels.editMode}}</button> <button ng-click="setCurrentElement(key)" ng-if="currentElement!=key"
</div> style="margin-left: 5px;"><i class="fa fa-edit"></i> {{::_labels.editMode}}</button>
<label>{{val[0].label}}: </label> </div>
<p ng-if="adminCompaniesDetailsCtrl.currentElement!=key" style="background: #eee; margin-top: 5px;">{{val[0].value}}</p> <label>{{val[0].label}}: </label>
<div ng-if="adminCompaniesDetailsCtrl.currentElement==key"> <p ng-if="currentElement!=key" style="background: #eee; margin-top: 5px;">{{val[0].value}}</p>
<div ng-if="currentElement==key">
<input ng-model="val[0].value" style="width:100%;"></input> <input ng-model="val[0].value" style="width:100%;"></input>
<div style="font-size:0.9em;"> <div style="font-size:0.9em;">
<span><i class="fa fa-eye"></i>{{::_labels.visibility}}</span> <span><i class="fa fa-eye"></i>{{::_labels.visibility}}</span>
...@@ -58,17 +59,18 @@ ...@@ -58,17 +59,18 @@
<span ng-if="val[0].visibility==2">{{::_labels.myCampusFieldTooltip}}</span> <span ng-if="val[0].visibility==2">{{::_labels.myCampusFieldTooltip}}</span>
</span> </span>
</div> </div>
<div class="separator"></div> <div class="separator"></div>
<div class="pull-right"> <div class="pull-right">
<button ng-click="adminCompaniesDetailsCtrl.setField(val[0]);">{{::_labels.editMode}}</button> <button ng-click="setField(val[0]);">{{::_labels.editMode}}</button>
<button class="cancel" ng-click="adminCompaniesDetailsCtrl.setCurrentElement(null)">{{::_labels.cancelBtn}}</button> <button class="cancel" ng-click="setCurrentElement(null)">{{::_labels.cancelBtn}}</button>
<button ng-click="adminCompaniesDetailsCtrl.deleteField(val[0]);"><i class="fa fa-trash"></i> {{::_labels.deleteMode}}</button> <button ng-click="deleteField(val[0]);"><i class="fa fa-trash"></i>
{{::_labels.deleteMode}}</button>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div>
</div> </section>
</section> </div>
</div> </div>
</div> \ No newline at end of file
\ No newline at end of file
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
</div> </div>
<div class="pull-right"> <div class="pull-right">
<button type="submit" ng-click="addNote(newNote)">{{::_labels.addUserBtn}}</button> <button type="submit" ng-click="addNote(newNote)">{{::_labels.addNoteTitle}}</button>
</div> </div>
<div style="font-size:0.9em;"> <div style="font-size:0.9em;">
<span><i class="fa fa-eye"></i>{{::_labels.visibility}}</span> <span><i class="fa fa-eye"></i>{{::_labels.visibility}}</span>
......
...@@ -22,6 +22,7 @@ root.controller('AdminProjectsCtrl' ,['$scope','$universityFactory','$stateParam ...@@ -22,6 +22,7 @@ root.controller('AdminProjectsCtrl' ,['$scope','$universityFactory','$stateParam
var refresh = function(){ var refresh = function(){
$universityFactory.get_campusProjects(prjCtrl.currentCampus.id,"",function(data){ $universityFactory.get_campusProjects(prjCtrl.currentCampus.id,"",function(data){
console.log(data);
prjCtrl.projects = data.details; prjCtrl.projects = data.details;
projects = []; projects = [];
parents = []; parents = [];
......
...@@ -75,7 +75,7 @@ root.controller('AdminGroupsCtrl' ,['$scope','$http','$universityFactory','$user ...@@ -75,7 +75,7 @@ root.controller('AdminGroupsCtrl' ,['$scope','$http','$universityFactory','$user
var refresh = function(){ var refresh = function(){
$usersGroupFactory.get_group_byCampus(AdminGrpCtrl.currentCampus.id,function(data){ $usersGroupFactory.get_group_byCampus(AdminGrpCtrl.currentCampus.id, null, function(data){
if(data.status=="success") AdminGrpCtrl.groupList = data.details; if(data.status=="success") AdminGrpCtrl.groupList = data.details;
},function(error){ },function(error){
...@@ -83,7 +83,8 @@ root.controller('AdminGroupsCtrl' ,['$scope','$http','$universityFactory','$user ...@@ -83,7 +83,8 @@ root.controller('AdminGroupsCtrl' ,['$scope','$http','$universityFactory','$user
})