Skip to content

Commit 9bcb4fa

Browse files
HFragnaudHFragnaud
authored
Merge pull request #199 from HFragnaud/master
fix filterMultiple + two small fix , see details
2 parents 44020ab + 15bb63a commit 9bcb4fa

File tree

5 files changed

+26
-32
lines changed

5 files changed

+26
-32
lines changed

‎model_validation_api/views.py

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -911,40 +911,30 @@ def get(self, request, format=None, **kwargs):
911911

912912
#if model id not specifiedorresponding to this alias.
913913
if(len(id) == 0):
914-
915-
# print("after going in first loop :", time.time()-time_spent)
916-
# time_spent=time.time()
914+
917915
web_app = request.GET.getlist('web_app')
918916

919917

920918
#if the request comes from the webapp : uses collab_parameters
921919
if len(web_app) > 0 and web_app[0] == 'True' :
922920

923-
# print("after going in first if :", time.time()-time_spent)
924-
# time_spent=time.time()
921+
925922
app_id = request.GET.getlist('app_id')[0]
926-
# print("after getting app_id:", time.time()-time_spent)
927-
# time_spent=time.time()
923+
928924
collab_id = get_collab_id_from_app_id(app_id)
929-
# print("after getting collab_id :", time.time()-time_spent)
930-
# time_spent=time.time()
925+
931926
collab_params = CollabParameters.objects.get(id = app_id )
932927

933928
collab_ids = list(CollabParameters.objects.all().values_list('collab_id', flat=True).distinct())
934-
# print("after getting collab_ids_list :", time.time()-time_spent)
935-
# collab_ids = ["2180"] #######don't forget to erase it!!!!
936-
# time_spent=time.time()
929+
937930
collab_ids_new = []
938931
for collab in collab_ids:
939932
if is_authorised(request, collab):
940933
collab_ids_new.append(collab)
941-
# print("after checking permissions :", time.time()-time_spent)
942-
# time_spent=time.time()
934+
943935
all_ctx_from_collab = CollabParameters.objects.filter(collab_id__in=collab_ids_new).distinct()
944936

945-
# print("after getting all ctx :", time.time()-time_spent)
946-
# time_spent=time.time()
947-
#if one of the collab_param is empty, don't filter on it.
937+
948938
species_filter = collab_params.species.split(",")
949939
if species_filter==[u'']:
950940
species_filter = list(Param_Species.objects.all().values_list('authorized_value', flat=True))+[u'']
@@ -2157,9 +2147,9 @@ def get(self, request, format=None, **kwargs):
21572147
#####quick fix to get out nan and infinity numbers --will need to change it by allowing the json
21582148
new_results = []
21592149
for result in results:
2160-
if not math.isnan(result.score) and not math.isnan(result.normalized_score):
2150+
if not math.isnan(float(result.score)) and not math.isnan(float(result.normalized_score)) and not math.isinf(float(result.score)) and not math.isinf(float(result.normalized_score)):
21612151
new_results.append(result)
2162-
2152+
21632153
data_to_return = organise_results_dict(detailed_view, param_order, new_results, serializer_context)
21642154

21652155
# file = get_storage_file_by_id(request)

‎validation_service/app/js/controller.js

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ testApp.controller('ValModelDetailCtrl', ['$scope', '$rootScope', '$http', '$loc
211211
$scope.$apply();
212212
});
213213
$scope.init_graph = init_graph.values;
214+
console.log("init graph", $scope.init_graph, $scope.init_graph.length)
214215
});
215216

216217
DataHandler.loadModels({ app_id: $scope.app_id }).then(function(data) {
@@ -945,7 +946,11 @@ testApp.filter('filterMultiple', ['$parse', '$filter', function($parse, $filter)
945946
if (obj.length > 0) {
946947
for (var i = 0; i < obj.length; i++) {
947948
if (angular.isDefined(obj[i])) {
948-
fObj[key] = obj[i];
949+
if (angular.isDefined(obj[i]['value'])) {
950+
fObj[key] = obj[i]['value'];
951+
} else {
952+
fObj[key] = obj[i];
953+
}
949954
fData = fData.concat($filter('filter')(this.filteredData, fObj));
950955
}
951956
}
@@ -1030,7 +1035,11 @@ ModelCatalogApp.filter('filterMultiple', ['$parse', '$filter', function($parse,
10301035
if (obj.length > 0) {
10311036
for (var i = 0; i < obj.length; i++) {
10321037
if (angular.isDefined(obj[i])) {
1033-
fObj[key] = obj[i];
1038+
if (angular.isDefined(obj[i]['value'])) {
1039+
fObj[key] = obj[i]['value'];
1040+
} else {
1041+
fObj[key] = obj[i];
1042+
}
10341043
fData = fData.concat($filter('filter')(this.filteredData, fObj));
10351044
}
10361045
}
@@ -1138,16 +1147,14 @@ ModelCatalogApp.controller('ModelCatalogCtrl', [
11381147

11391148
CollabParameters.setService($scope.ctx).then(function() {
11401149

1141-
$scope.model_privacy = [{ "name": "private", "value": true }, { "name": "public", "value": false }];
1142-
$scope.selected_privacy = $scope.model_privacy;
1150+
$scope.model_privacy = [{ value: "true", name: "private" }, { value: "false", name: "public" }] //[{ "name": "private", "value": "true" }, { "name": "public", "value": "false" }];
11431151

11441152
$scope.collab_species = CollabParameters.getParametersOrDefaultByType("species");
11451153
$scope.collab_brain_region = CollabParameters.getParametersOrDefaultByType("brain_region");
11461154
$scope.collab_cell_type = CollabParameters.getParametersOrDefaultByType("cell_type");
11471155
$scope.collab_model_type = CollabParameters.getParametersOrDefaultByType("model_type");
11481156
$scope.collab_organization = CollabParameters.getParametersOrDefaultByType("organization");
11491157

1150-
// $scope.models = ScientificModelRest.get({ app_id: app_id });
11511158

11521159

11531160

‎validation_service/app/templates/model_catalog/model-catalog-edit.tpl.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ <h2>
6464
<b>Owner:</b>
6565
</td>
6666
<td>
67-
<input type="text" ng-model=model.models[0].owner required/>
67+
<input type="text" ng-model=model.models[0].owner/>
6868
</td>
6969
</tr>
7070

@@ -83,8 +83,7 @@ <h2>
8383
</td>
8484
<td>
8585
<b>Private: </b> &nbsp
86-
<!--</td>
87-
<td>-->
86+
8887
<label><input type="radio" ng-model="model.models[0].private" value="false"/>no</label> &emsp;
8988
<label><input type="radio" ng-model="model.models[0].private" value="true" />yes</label>
9089
</td>

‎validation_service/app/templates/model_catalog/model-catalog.tpl.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,7 @@ <h1 align=center> Model Catalog</h1>
5858
</tr>
5959
</thead>
6060
<tbody>
61-
<!--<tr ng-mousedown="Context.goToModelDetailView($event, model.id)" oncontextmenu="return false" class="tr-clickable " dir-paginate="model in models.models | filter:search | filterMultiple:{ organization:selected_organization, species:selected_species, brain_region:selected_brain_region , cell_type:selected_cell_type, model_type:selected_model_type}
62-
| orderBy: selected_sorting_option | itemsPerPage: itemsPerPages" pagination-id="models" total-items="total_models">-->
63-
<tr ng-mousedown="Context.goToModelDetailView($event, model.id)" oncontextmenu="return false" class="tr-clickable " dir-paginate="model in models.models | filter:search | filterMultiple:{ organization:selected_organization, species:selected_species, brain_region:selected_brain_region , cell_type:selected_cell_type, model_type:selected_model_type}
61+
<tr ng-mousedown="Context.goToModelDetailView($event, model.id)" oncontextmenu="return false" class="tr-clickable " dir-paginate="model in models.models | filter:search | filterMultiple:{ organization:selected_organization, species:selected_species, brain_region:selected_brain_region , cell_type:selected_cell_type, model_type:selected_model_type, private: selected_privacy}
6462
| orderBy: selected_sorting_option | itemsPerPage: itemsPerPages" pagination-id="models">
6563
<td>{{ model.name}}</td>
6664
<td ng-text-truncate=model.alias ng-tt-chars-threshold="50 " ng-tt-no-toggling>{{ model.alias }}</td>

‎validation_service/app/templates/validation_framework/validation_model_detail.tpl.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ <h4 align=center> <b>Model Description</b> </h4>
6969

7070
<br>
7171
<br>
72-
<div id='panel-no-results' ng-if="init_graph.values.length == 0">
72+
<div id='panel-no-results' ng-if="init_graph.length == 0">
7373
<h3 align=center> No result available for this model </h3>
7474
</div>
7575

7676

77-
<div id=panel-results ng-if="init_graph.values.length != 0">
77+
<div id=panel-results ng-if="init_graph.length != 0">
7878
<h4 align=center> <b> Results </b></h4>
7979
<br>
8080
<div id=VF-model-table-all-data>

0 commit comments

Comments
 (0)