Skip to content

Commit

Permalink
Merge pull request #210 from HFragnaud/master
Browse files Browse the repository at this point in the history 
#193, #153
  • Loading branch information
@HFragnaud
HFragnaud authored Jun 28, 2018
2 parents b59c61c + e8aee37 commit 618c4a3
Show file tree
Hide file tree
Showing 6 changed files with 232 additions and 72 deletions.
73 changes: 73 additions & 0 deletions validation_service/app/css/app.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -377,4 +377,77 @@ table {
background-position: center;
margin: -100px 0 0 -100px;
/* is width and height divided by two */
}


/*ui-tree*/

.btn {
margin-right: 8px;
}

.angular-ui-tree-handle {
/*background: #f8faff;*/
border: 1px solid #dae2ea;
color: #687074;
padding: 10px 10px;
}


/*.angular-ui-tree-handle:hover {
color: #438eb9;
background: #f4f6f7;
border-color: #dce2e8;
}*/

.angular-ui-tree-placeholder {
background: #f0f9ff;
border: 2px dashed #bed2db;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}

tr.angular-ui-tree-empty {
height: 100px
}

.group-title {
background-color: #687074;
color: #FFF;
}


/* --- Tree --- */

.tree-node {
border: 1px solid #dae2ea;
/*background: #f8faff;*/
/*color: #7c9eb2;*/
/*color: darkgrey;*/
}

.nodrop {
background-color: #f2dede;
}

.tree-node-content {
margin: 10px;
}

.tree-handle {
padding: 10px;
/*background: #428bca;*/
/*color: #FFF;*/
margin-right: 10px;
}

.angular-ui-tree-handle:hover {}

.angular-ui-tree-placeholder {
/*background: #f0f9ff;*/
border: 2px dashed #bed2db;
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
}
1 change: 1 addition & 0 deletions validation_service/app/js/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
'clb-app',
'hbpCollaboratory',
'angularUtils.directives.dirPagination',
'ui.tree',
// 'hbpCollaboratory',
// 'clbBoostrap',
// 'clb-env',
Expand Down
98 changes: 83 additions & 15 deletions validation_service/app/js/controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,19 @@ testApp.controller('HomeCtrl', ['$scope', '$rootScope', '$http', '$location', "S

$scope.$on('models_updated', function(event, models) {
$scope.models = models;
$scope.collab_ids_to_select = $scope._get_collab_and_app_ids_from_models();
});

$scope._get_collab_and_app_ids_from_models = function() {
for (var i in $scope.models.models) {
if ($scope.models.models[i].app != null) {
if ($scope.collab_ids_to_select.indexOf($scope.models.models[i].app.collab_id.toString()) == -1) {
$scope.collab_ids_to_select.push($scope.models.models[i].app.collab_id.toString());
}
}
}
$scope.$apply();
}

Context.setService().then(function() {

Expand Down Expand Up @@ -47,6 +58,8 @@ testApp.controller('HomeCtrl', ['$scope', '$rootScope', '$http', '$location', "S
$('#preloader-models').delay(350).fadeOut('slow'); // will fade out the white DIV that covers the website.
$('#models-panel').delay(350).css({ 'overflow': 'visible' });

$scope.collab_ids_to_select = new Array();
$scope._get_collab_and_app_ids_from_models();

var status = DataHandler.getCurrentStatus();
if (status != "up_to_date") {
Expand Down Expand Up @@ -715,7 +728,59 @@ testApp.controller('ValTestDetailCtrl', ['$scope', '$rootScope', '$http', '$loca

testApp.controller('ValTestResultDetailCtrl', ['$window', '$scope', '$rootScope', '$http', '$sce', '$location', '$stateParams', 'IsCollabMemberRest', 'AppIDRest', 'ValidationResultRest', 'CollabParameters', 'ScientificModelRest', 'ValidationTestDefinitionRest', "Context", "clbStorage", "clbAuth", 'DataHandler', 'clbCollabNav',
function($window, $scope, $rootScope, $http, $sce, $location, $stateParams, IsCollabMemberRest, AppIDRest, ValidationResultRest, CollabParameters, ScientificModelRest, ValidationTestDefinitionRest, Context, clbStorage, clbAuth, DataHandler, clbCollabNav) {
// var vm = this;

//ui-tree

$scope.toggle = function(scope) {
scope.toggle();
};

$scope.collapseAll = function() {
$scope.$broadcast('angular-ui-tree:collapse-all');
};

$scope.expandAll = function() {
$scope.$broadcast('angular-ui-tree:expand-all');
};

$scope._tranform_data_for_ui_tree = function(storage_folder_children) {
var data = [];

var i = 0;
for (i; i < storage_folder_children.results.length; i++) {
var elem = storage_folder_children.results[i];

if (elem.entity_type == "folder") {
elem.nodes = [];
}
data.push(elem);
}
return data;
}

$scope.getFolderContent = function(scope, node) {
var nodeData = scope.$modelValue;
if (!node.nodes.length > 0) {

clbStorage.getChildren({ uuid: node.uuid, entity_type: 'folder' }).then(function(res) {

var i = 0;
for (i; i < res.results.length; i++) {
var elem = res.results[i];
if (elem.entity_type == "folder") {
elem.nodes = [];
}
nodeData.nodes.push(elem);
}
})
} else {
if (!nodeData.nodes.length > 0) {
nodeData.nodes = node.nodes;
}
}
scope.toggle();
}
////ui tree

$scope.split_result_storage_string = function(storage_string) {
storage_string = storage_string.slice(10, storage_string.length)
Expand All @@ -728,7 +793,7 @@ testApp.controller('ValTestResultDetailCtrl', ['$window', '$scope', '$rootScope'
};

//NOT USED?
// $scope.get_correct_folder_using_name = function(name, folders) {
// $scope.get_correct_folder_using_name = function(name, folders) {
// for (var i in folders) {
// if (folders[i].name == name) {
// return (folders[i]);
Expand All @@ -755,13 +820,14 @@ testApp.controller('ValTestResultDetailCtrl', ['$window', '$scope', '$rootScope'
});
};



Context.setService().then(function() {
$scope.Context = Context;

$scope.ctx = Context.getCtx();
$scope.app_id = Context.getAppID();


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

var test_result = ValidationResultRest.get({ id: $stateParams.uuid, order: "", detailed_view: true });
Expand Down Expand Up @@ -795,22 +861,19 @@ testApp.controller('ValTestResultDetailCtrl', ['$window', '$scope', '$rootScope'
}
// $scope.storage_url =
//https://collab.humanbrainproject.eu/#/collab/2169/nav/18935


},
function(not_working) {})
.finally(function() {});

clbStorage.getEntity({ path: "?path=/" + collab + "/" + folder_name + "/" }).then(function(collabStorageFolder) {

clbStorage.getChildren({ uuid: collabStorageFolder.uuid, entity_type: 'folder' }).then(function(storage_folder_children) {

$scope.storage_files = storage_folder_children.results
clbStorage.getChildren({ uuid: collabStorageFolder.uuid, entity_type: 'folder' }).then(function(storage_folder_children) {

}, function() {})
.finally(function() {});
$scope.storage_files = $scope._tranform_data_for_ui_tree(storage_folder_children)

}, function(not_worked) {}).finally(function() {});
});
},
function(not_worked) {}).finally(function() {});

DataHandler.loadModels({ app_id: $scope.app_id }).then(function(data) {
$scope.models = data
Expand Down Expand Up @@ -954,6 +1017,7 @@ testApp.filter('filterMultiple', ['$parse', '$filter', function($parse, $filter)
if (!angular.isArray(items)) {
return items;
}

var filterObj = {
data: items,
filteredData: [],
Expand All @@ -973,9 +1037,15 @@ testApp.filter('filterMultiple', ['$parse', '$filter', function($parse, $filter)
if (angular.isDefined(obj[i]['value'])) {
fObj[key] = obj[i]['value'];
} else {
fObj[key] = obj[i];
if (key == 'collab_id') { //specific for Model Catalog home: to allow filter by collab (deep filter)
fObj['app'] = {}
fObj['app'][key] = obj[i];
} else {
fObj[key] = obj[i];
}
}
fData = fData.concat($filter('filter')(this.filteredData, fObj));

}
}
}
Expand All @@ -998,14 +1068,11 @@ testApp.filter('filterMultiple', ['$parse', '$filter', function($parse, $filter)
filterObj.applyFilter(obj, key);
});
}

return filterObj.filteredData;
}
}]);




//Model catalog
//directives and filters
var ModelCatalogApp = angular.module('ModelCatalogApp');
Expand Down Expand Up @@ -1141,6 +1208,7 @@ ModelCatalogApp.controller('ModelCatalogCtrl', [
$scope.$on('models_updated', function(event, models) {
$scope.models = $scope._change_empty_organization_string(models);
$scope.collab_ids_to_select = $scope._get_collab_and_app_ids_from_models();

});

Context.setService().then(function() {
Expand Down
5 changes: 3 additions & 2 deletions validation_service/app/templates/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,9 @@

<script type="text/javascript" src="{% static 'static/angularUtils-pagination/dirPagination.js' %}"></script>



<link rel="stylesheet" href="{% static 'static/angular-ui-tree/dist/angular-ui-tree.min.css' %}">
</link>
<script type="text/javascript" src="{% static 'static/angular-ui-tree/dist/angular-ui-tree.js' %}"></script>
<!--TODO: get the package inside our packages-->
<script src="https://code.angularjs.org/1.5.5/angular-cookies.js"></script>
<script src="https://code.angularjs.org/1.5.5/angular-cookies.min.js"></script>
Expand Down
17 changes: 12 additions & 5 deletions validation_service/app/templates/validation_framework/home_1.tpl.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@ <h1 align=center> Validation Results </h1>
<nav>
<table class="table-create">
<tr>
<td>
<label> Search : <input id="search_model" ng-model='search.$'> </label>
</td>


<td>
<multiselect ng-model="selected_species" placeholder="Select species" options="collab_species" show-search="true" show-select-all="true" show-unselect-all="true"></multiselect>
Expand All @@ -37,7 +35,9 @@ <h1 align=center> Validation Results </h1>
<td>
<multiselect ng-model="selected_organization" placeholder="Select organization" options="collab_organization" show-search="true" show-select-all="true" show-unselect-all="true"></multiselect>
</td>

<td>
<multiselect ng-model="selected_collab" placeholder="Select collab" options="collab_ids_to_select"></multiselect>
</td>
<td>
<select id="sorting_option" placeholder="Sorting options" class="form-control" ng-model="selected_sorting_option">
<option value="">Sorting options</option>
Expand All @@ -48,6 +48,13 @@ <h1 align=center> Validation Results </h1>

</tr>
</table>
<table>
<tr>
<td>
<label> Search : <input id="search_model" ng-model='search.$'> </label>
</td>
</tr>
</table>
<br>
<div align=right> <button class="button-MC" ng-click="Context.validation_goToTestCatalogView()">Go to Test Library</button></div>
<br>
Expand All @@ -68,7 +75,7 @@ <h3 align=center> Models</h3>
<th>Author</th>
</thead>
<br>
<tr class=tr-clickable id="test1" 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} | orderBy: selected_sorting_option | itemsPerPage: itemsPerPages"
<tr class=tr-clickable id="test1" 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, collab_id: selected_collab} | orderBy: selected_sorting_option | itemsPerPage: itemsPerPages"
pagination-id="models-pagination" ng-mousedown="Context.goToValidationModelView($event, model)">
<td ng-if=!(model.alias) ng-text-truncate=model.name ng-tt-chars-threshold="20" ng-tt-no-toggling> {{model.name}} </td>
<td ng-if=model.alias ng-text-truncate=model.alias ng-tt-chars-threshold="20" ng-tt-no-toggling> {{model.alias}} </td>
Expand Down
Loading

0 comments on commit 618c4a3

Please sign in to comment.