Skip to content

Commit

Permalink
fixed some issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@BruunoMarques
BruunoMarques committed Jul 13, 2017
1 parent 6de2e64 commit cc81831
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 240 deletions.
2 changes: 1 addition & 1 deletion src/views/projects/show.ejs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@
<%- include show/descriptor_selection_variants/descriptors_selection_area_rec.ejs %>
</div>

<div class="col-md-3 col-xs-12 col-sm-12" id="statistics" ng-show="showing_statistics()" ng-controller="statisticsCtrl" ng-init="init()" ng-show="!(shared.multiple_selection_active && file_explorer_selected_something())">
<div class="col-md-3 col-xs-12 col-sm-12" id="statistics" ng-show="showing_descriptor_selection_area()" ng-controller="descriptorListCtrl" ng-init="init()" ng-show="(shared.multiple_selection_active && file_explorer_selected_something())">
<%- include show/project_stats.ejs %>
</div>

Expand Down
240 changes: 1 addition & 239 deletions src/views/projects/show/project_stats.ejs
View file
Original file line number Diff line number Diff line change
@@ -1,244 +1,6 @@
<div class="row">
<div class="col-md-12">
<div class="btn-group btn-group-justified" data-toggle="buttons">
<label class="btn"
ng-class="{active : descriptor_selection_mode == 'recommendation'}"
id="change_descriptor_selection_to_recommendation_button"
ng-click="switch_selection_mode('recommendation');">

<input type="radio"
name="options"
ng-checked="descriptor_selection_mode == 'recommendation'">Suggestions
</label>

<label class="btn"
ng-class="{active : descriptor_selection_mode == 'manual'}"
id="change_descriptor_selection_to_manual_button"
ng-click="switch_selection_mode('manual');">

<input type="radio"
name="options"
ng-checked="descriptor_selection_mode == 'manual'">Manual selection
</label>
</div>
</div>
</div>

<%- include ../descriptor_autocomplete.ejs %>

<!-- all rec ok -->

<div ng-switch="descriptor_selection_mode">
<div id="manual_descriptor_selection" ng-switch-when="manual">

<div ng-show="manually_selected_ontology == null">
<br/>
<div class="row">
<div class="col-lg-12">
<ul class="list-group">
<a href="" onclick="return false;" ng-repeat="ontology in public_ontologies" class="list-group-item recommendation-item">
<div class="row" ng-click="manually_select_ontology(ontology)">
<%- include ontology_list_item.ejs %>
</div>
</a>
</ul>
</div>
</div>
<br/>
</div>

<div ng-show="fetching_descriptors_from_manual_ontology">
<br/>
<div class="panel panel-info" >
<div class="panel-heading">
<h3 class="panel-title">Please wait...</h3>
</div>
<div class="panel-body">
Fetching descriptors from ontology {{manually_selected_ontology.label}}...
</div>
</div>
</div>

<div ng-show="manually_selected_ontology != null && !fetching_descriptors_from_manual_ontology">
<br/>
<div class="row">
<div class="col-lg-12">
<div class="tab-pane" id="overview">
<ul class="list-group">
<li class="list-group-item">
<a href="" onclick="return false;">
<div class="row" ng-click="clear_manually_selected_ontology()">
<div class="col-lg-1">
<i class="fa fa-backward"></i>
</div>
<div class="col-lg-10">
<h4 class="list-group-item-heading"
uib-tooltip="{{manually_selected_ontology.description}}"
tooltip-placement="top"
tooltip-trigger="mouseenter">
{{manually_selected_ontology.label}}<small>{{manually_selected_ontology.comment}}</small>
</h4>
</div>
</div>
</a>
</li>
</ul>
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<ul class="list-group">
<div class="row">
<div class="col-lg-12">
<a class="list-group-item recommendation-item"
ng-repeat="manual_descriptor in manual_descriptors"
ng-show="manual_descriptor.label &&
manual_descriptor.comment &&
(
(
descriptor_filter === 'hidden'
&&
(
manual_descriptor.recommendation_types['project_hidden']
||
manual_descriptor.recommendation_types['user_hidden']
)
)
||
(
descriptor_filter === 'favorites'
&&
(
manual_descriptor.recommendation_types['project_favorite']
||
manual_descriptor.recommendation_types['user_favorite']
)
)
||
(
descriptor_filter === 'all' &&
!(manual_descriptor.recommendation_types['project_hidden'] == true) &&
!(manual_descriptor.recommendation_types['user_hidden'] == true)
)
)
">
<%if(locals.Config.debug.debug_active && locals.Config.debug.views.show_all_buttons_in_recommendations) { %>
<ng-include src="'/app/views/projects/show/partials/manual_descriptor_debug.html'"></ng-include>
<%} else {%>
<ng-include src="'/app/views/projects/show/partials/manual_descriptor.html'"></ng-include>
<% } %>
</a>
</div>
</div>
</ul>
</div>
</div>
<div class="row">
<div class="col-xs-12" data-toggle="buttons">
<div class="btn-group btn-group-justified" data-toggle="buttons">
<label class="btn btn-default"
ng-class="{'active' : descriptor_filter == 'all', 'btn-primary' : descriptor_filter == 'all'}"
id="change_descriptor_selection_to_recommendation_button"
ng-click="switch_descriptor_filter('all');">

<input type="radio"
name="options"
ng-checked="descriptor_filter == 'all'">All
</label>

<label class="btn btn-default"
ng-class="{'active' : descriptor_filter == 'favorites', 'btn-success' : descriptor_filter == 'favorites'}"
id="change_descriptor_selection_to_manual_button"
ng-click="switch_descriptor_filter('favorites');">

<input type="radio"
name="options"
ng-checked="descriptor_filter == 'favorites'">Favorites
</label>

<label class="btn btn-default"
ng-class="{'active' : descriptor_filter == 'hidden', 'btn-danger' : descriptor_filter == 'hidden'}"
id="change_descriptor_selection_to_manual_button"
ng-click="switch_descriptor_filter('hidden');">

<input type="radio"
name="options"
ng-checked="descriptor_filter == 'hidden'">Hidden
</label>
</div>
</div>
<br/>
</div>
</div>
</div>

<div id="recommendation_based_descriptor_selection" ng-switch-when="recommendation">
<div id="recommendations_mode">

<div class="tab-pane" id="overview">

<br/>

<%- include ../descriptors_list.ejs %>

<div class="row" ng-hide="shared.recommender_offline">
<div class="col-xs-12">
<div class="btn-group btn-group-justified" data-toggle="buttons">
<label class="btn btn-default"
ng-class="{'active' : descriptor_filter == 'all', 'btn-primary' : descriptor_filter == 'all'}"
id="change_descriptor_filter_to_all_button"
ng-click="switch_descriptor_filter('all', true);">

<input type="radio"
name="options"
ng-checked="descriptor_filter == descriptor_filters[0].key">All
</label>

<label class="btn btn-default"
ng-class="{'active' : descriptor_filter == 'favorites', 'btn-success' : descriptor_filter == 'favorites'}"
id="change_descriptor_filter_to_favorites_button"
ng-click="switch_descriptor_filter('favorites', true);">

<input type="radio"
name="options"
ng-checked="descriptor_filter == 'favorites'">Favorites
</label>

<label class="btn btn-default"
ng-class="{'active' : descriptor_filter == 'hidden', 'btn-danger' : descriptor_filter == 'hidden'}"
id="change_descriptor_selection_to_hidden_button"
ng-click="switch_descriptor_filter('hidden', true);">

<input type="radio"
name="options"
ng-checked="descriptor_filter == 'hidden'">Hidden
</label>
</div>
</div>
</div>
<div class="row" ng-hide="shared.recommender_offline">
<div class="col-lg-12">
<br/>
<div class="btn-group-justified btn-group" data-toggle="buttons">
<label class="btn btn-sm"
ng-class="{'active' : recommend_already_filled_in, 'btn-primary' : recommend_already_filled_in}"
id="toggle_recommend_already_filled_in_button"
ng-click="toggle_recommend_already_filled_in();">

<input type="radio"
name="options"
ng-checked="recommend_already_filled_in">
<div ng-show="!recommend_already_filled_in">Showing only non-filled descriptors</div>
<div ng-show="recommend_already_filled_in">Showing all descriptors </div>

</label>
</div>
</div>
</div>
<br/>
</div>
</div>
<p> This is a place holder.</p>
</div>

</div>

0 comments on commit cc81831

Please sign in to comment.