This commit is contained in:
parent
4d6bc4b327
commit
e4e3ea6110
|
|
@ -49,7 +49,7 @@ public class VocabularyRestController extends AbstractDnetController {
|
|||
public List<Vocabulary> listVocs() {
|
||||
return vocabularyRepository.findAll()
|
||||
.stream()
|
||||
.sorted((v1, v2) -> StringUtils.compare(v1.getName(), v2.getName()))
|
||||
.sorted((v1, v2) -> StringUtils.compareIgnoreCase(v1.getId(), v2.getId()))
|
||||
.collect(Collectors.toList());
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,14 +24,23 @@ app.controller('vocabulariesController', function($scope, $http) {
|
|||
|
||||
$scope.prepareEditVoc = function(voc) {
|
||||
$scope.mode = 'edit';
|
||||
$scope.tmpVoc = {
|
||||
'id' : voc.id,
|
||||
'name' : voc.name,
|
||||
'description' : voc.description
|
||||
};
|
||||
$scope.tmpVoc = angular.copy(voc);
|
||||
}
|
||||
|
||||
$scope.saveVocabulary = function(voc) {
|
||||
if ($scope.mode == 'new') {
|
||||
var found = false;
|
||||
|
||||
angular.forEach($scope.vocabularies, function(v) {
|
||||
if (voc.id == v.id) { found = true; };
|
||||
});
|
||||
|
||||
if (found) {
|
||||
alert("Insertion failed: vocabulary already exists !");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
$http.defaults.headers.post["Content-Type"] = "application/json;charset=UTF-8";
|
||||
$http.post('./api/vocs/?' + $.now(), voc).then(function successCallback(res) {
|
||||
$scope.vocabularies = res.data;
|
||||
|
|
|
|||
|
|
@ -3,6 +3,10 @@ var app = angular.module('vocabularyApp', []);
|
|||
app.controller('vocabularyController', function($scope, $http, $location) {
|
||||
$scope.terms = [];
|
||||
$scope.vocId = vocId();
|
||||
$scope.editTermCode = '';
|
||||
$scope.tmpTerm = {};
|
||||
$scope.mode = '';
|
||||
$scope.currTerm = [];
|
||||
|
||||
$scope.reload = function() {
|
||||
$http.get('./api/vocs/'+ encodeURIComponent($scope.vocId) + '/terms?' + $.now()).then(function successCallback(res) {
|
||||
|
|
@ -12,16 +16,52 @@ app.controller('vocabularyController', function($scope, $http, $location) {
|
|||
});
|
||||
};
|
||||
|
||||
$scope.newTerm = function(code, englishName, nativeName) {
|
||||
$scope.setCurrTerm = function(term) {
|
||||
$scope.currTerm = angular.copy(term);
|
||||
}
|
||||
|
||||
$scope.prepareNewTerm = function() {
|
||||
$scope.mode = 'new';
|
||||
$scope.editTermCode = '';
|
||||
$scope.tmpTerm = {
|
||||
'code' : '',
|
||||
'englishName' : '',
|
||||
'nativeName' : '',
|
||||
'synonyms' : []
|
||||
};
|
||||
}
|
||||
|
||||
$scope.prepareEditTerm = function(term) {
|
||||
$scope.mode = 'edit';
|
||||
$scope.editTermCode = term.code;
|
||||
$scope.tmpTerm = angular.copy(term);
|
||||
}
|
||||
|
||||
|
||||
$scope.saveTerm = function(term) {
|
||||
$http.defaults.headers.post["Content-Type"] = "application/json;charset=UTF-8";
|
||||
alert("TO SAVE HERE - " + term.code);
|
||||
|
||||
//TODO
|
||||
|
||||
if ($scope.editTermCode != '' && $scope.editTermCode != $scope.tmpTerm.code) {
|
||||
$scope.callDeleteTerm($scope.editTermCode);
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
$scope.deleteTerm = function(code) {
|
||||
if (confirm("Are you sure ?")) {
|
||||
//TODO
|
||||
$scope.callDeleteTerm(code);
|
||||
}
|
||||
};
|
||||
|
||||
$scope.callDeleteTerm = function(code) {
|
||||
alert("TO DELETE HERE - " + code);
|
||||
// TODO
|
||||
};
|
||||
|
||||
|
||||
|
||||
$scope.reload();
|
||||
});
|
||||
|
|
|
|||
|
|
@ -11,6 +11,10 @@
|
|||
td {
|
||||
vertical-align: middle !important;
|
||||
}
|
||||
label {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
<body ng-app="vocabulariesApp" ng-controller="vocabulariesController">
|
||||
|
|
|
|||
|
|
@ -11,6 +11,9 @@
|
|||
td {
|
||||
vertical-align: middle !important;
|
||||
}
|
||||
label {
|
||||
font-weight: bold;
|
||||
}
|
||||
</style>
|
||||
|
||||
<script th:inline="javascript">
|
||||
|
|
@ -31,6 +34,10 @@
|
|||
<b>Name: </b><span th:text="${vocName}"></span><br />
|
||||
<b>Description: </b><span th:text="${vocDesc}"></span>
|
||||
</p>
|
||||
<hr />
|
||||
<p>
|
||||
<a href="javascript:void(0)" data-toggle="modal" data-target="#editVocabularyTermModal" ng-click="prepareNewTerm()">create a new term</a>
|
||||
</p>
|
||||
|
||||
<p ng-show="terms.length > 0">
|
||||
<input type="text" class="form-control form-control-sm" ng-model="termFilter" placeholder="Filter..."/>
|
||||
|
|
@ -57,8 +64,17 @@
|
|||
<th>{{t.code}}</th>
|
||||
<td>{{t.englishName}}</td>
|
||||
<td>{{t.nativeName}}</td>
|
||||
<td>{{t.synonyms.length}} synonym(s)</td>
|
||||
<td align="right"><button type="button" class="btn btn-sm btn-danger" ng-click="deleteTerm(t.id)">delete</button></td>
|
||||
<td>
|
||||
<a href="javascript:void(0)"
|
||||
data-toggle="modal" data-target="#showSynonymsModal"
|
||||
ng-show="t.synonyms.length > 0"
|
||||
ng-click="setCurrTerm(t)">{{t.synonyms.length}} synonym(s)</a>
|
||||
<span class="text-muted" ng-show="t.synonyms.length == 0">0 synonym(s)</span>
|
||||
</td>
|
||||
<td align="right">
|
||||
<button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#editVocabularyTermModal" ng-click="prepareEditTerm(t)" >edit</button>
|
||||
<button type="button" class="btn btn-sm btn-danger" ng-click="deleteTerm(t.code)">delete</button>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
|
@ -66,6 +82,57 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Modals -->
|
||||
|
||||
<div class="modal fade" tabindex="-1" id="editVocabularyTermModal">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title" ng-if="mode == 'new'">New term</h4>
|
||||
<h4 class="modal-title" ng-if="mode == 'edit'">Edit term</h4>
|
||||
<button type="button" class="close" data-dismiss="modal">×</button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<form>
|
||||
<div class="form-group">
|
||||
<label>Code</label>
|
||||
<input type="text" class="form-control" ng-model="tmpTerm.code" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>English Name</label>
|
||||
<input type="text" class="form-control" ng-model="tmpTerm.englishName" />
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label>Native Name</label>
|
||||
<input type="text" class="form-control" ng-model="tmpTerm.nativeName" />
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-sm btn-secondary" data-dismiss="modal">Close</button>
|
||||
<button type="submit" class="btn btn-sm btn-primary" data-dismiss="modal" ng-click="saveTerm(tmpTerm)">Submit</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" tabindex="-1" id="showSynonymsModal">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h4 class="modal-title">Synonyms of {{currTerm.code}}</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div ng-repeat="s in currTerm.synonyms">
|
||||
<span class="badge badge-primary" >{{s}}</span>
|
||||
<br />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</body>
|
||||
|
||||
<script src="common/js/jquery.min.js"></script>
|
||||
|
|
|
|||
Loading…
Reference in New Issue