Skip to content

Commit

Permalink
UPDATE: issue #40, test create dataset, UI selecting project for crea…
Browse files Browse the repository at this point in the history
…teing dataset
  • Loading branch information
TomasKulhanek committed Mar 27, 2018
1 parent 7edac66 commit 92d5c28
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,10 @@ public void testcreateEmptyDatasets() throws IOException {
assertThat(
response.getStatusLine().getStatusCode(), equalTo(HttpStatus.SC_OK)
);
//TODO delete
//HttpDelete request3 = new HttpDelete("http://localhost/repositorytest/restcon/dataset");

//delete
DatasetDTO resource = retrieveResourceFromResponse(response, DatasetDTO.class);
HttpDelete request3 = new HttpDelete("http://localhost/repositorytest/restcon/dataset/"+resource.id);

}

Expand Down
4 changes: 2 additions & 2 deletions frontend/scripts/app-bundle.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/scripts/vendor-bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -95899,4 +95899,4 @@ define('aurelia-testing/wait',["require", "exports"], function (require, exports
exports.waitForDocumentElements = waitForDocumentElements;
});

function _aureliaConfigureModuleLoader(){requirejs.config({"baseUrl":"src/","paths":{"aurelia-dependency-injection":"../node_modules/aurelia-dependency-injection/dist/amd/aurelia-dependency-injection","aurelia-event-aggregator":"../node_modules/aurelia-event-aggregator/dist/amd/aurelia-event-aggregator","aurelia-framework":"../node_modules/aurelia-framework/dist/amd/aurelia-framework","aurelia-bootstrapper":"../node_modules/aurelia-bootstrapper/dist/amd/aurelia-bootstrapper","aurelia-history":"../node_modules/aurelia-history/dist/amd/aurelia-history","aurelia-history-browser":"../node_modules/aurelia-history-browser/dist/amd/aurelia-history-browser","aurelia-loader":"../node_modules/aurelia-loader/dist/amd/aurelia-loader","aurelia-loader-default":"../node_modules/aurelia-loader-default/dist/amd/aurelia-loader-default","aurelia-metadata":"../node_modules/aurelia-metadata/dist/amd/aurelia-metadata","aurelia-pal":"../node_modules/aurelia-pal/dist/amd/aurelia-pal","aurelia-logging":"../node_modules/aurelia-logging/dist/amd/aurelia-logging","aurelia-binding":"../node_modules/aurelia-binding/dist/amd/aurelia-binding","aurelia-polyfills":"../node_modules/aurelia-polyfills/dist/amd/aurelia-polyfills","aurelia-logging-console":"../node_modules/aurelia-logging-console/dist/amd/aurelia-logging-console","aurelia-pal-browser":"../node_modules/aurelia-pal-browser/dist/amd/aurelia-pal-browser","aurelia-path":"../node_modules/aurelia-path/dist/amd/aurelia-path","aurelia-route-recognizer":"../node_modules/aurelia-route-recognizer/dist/amd/aurelia-route-recognizer","aurelia-router":"../node_modules/aurelia-router/dist/amd/aurelia-router","aurelia-task-queue":"../node_modules/aurelia-task-queue/dist/amd/aurelia-task-queue","aurelia-templating-binding":"../node_modules/aurelia-templating-binding/dist/amd/aurelia-templating-binding","aurelia-templating":"../node_modules/aurelia-templating/dist/amd/aurelia-templating","text":"../node_modules/text/text","aurelia-http-client":"../node_modules/aurelia-http-client/dist/amd/aurelia-http-client","aurelia-fetch-client":"../node_modules/aurelia-fetch-client/dist/amd/aurelia-fetch-client","app-bundle":"../scripts/app-bundle"},"packages":[{"name":"codemirror","location":"../node_modules/codemirror","main":"lib/codemirror"},{"name":"aurelia-templating-router","location":"../node_modules/aurelia-templating-router/dist/amd","main":"aurelia-templating-router"},{"name":"aurelia-testing","location":"../node_modules/aurelia-testing/dist/amd","main":"aurelia-testing"},{"name":"aurelia-templating-resources","location":"../node_modules/aurelia-templating-resources/dist/amd","main":"aurelia-templating-resources"},{"name":"handsontable","location":"../node_modules/handsontable","main":"dist/handsontable.full"}],"stubModules":["text"],"shim":{},"bundles":{"app-bundle":["app","environment","main","repositoryapp","repositorymain","staffapp","staffmain","components/ariaapi","components/ariaapixhr","components/csrfheaderinterceptor","components/datasettable","components/fileeditor","components/htable","components/importaria","components/messages","components/nmrapi","components/projectapi","components/projecttable","components/searchbydate","components/staffuserinfo","components/userinfo","components/webdavfilepanel","pickerclient/pickerclient","resources/icopy","resources/index","resources/iupload","scientist/createdataset","scientist/dashboard","scientist/dashboarddetail","scientist/repositorytovf","staff/dashboard","staff/dataupload","staff/repositorystaff","staff/upconfirm","staff/upselectdata","staff/upselectdataset","staff/upselectuser","codemirror/mode/clike/clike","codemirror/mode/htmlmixed/htmlmixed","codemirror/mode/xml/xml","codemirror/mode/javascript/javascript","codemirror/mode/css/css","icons","w3","components/heads","components/navigation","components/sharedfooter","components/sharedheader","resources/iadmin","resources/idata","resources/idelete","resources/ifile","resources/ifolder","resources/ilink","resources/inext","resources/iproject","resources/irep","resources/irepdemo","resources/ispincog","resources/istaff","resources/itable"]}})}
function _aureliaConfigureModuleLoader(){requirejs.config({"baseUrl":"src/","paths":{"aurelia-binding":"../node_modules/aurelia-binding/dist/amd/aurelia-binding","aurelia-dependency-injection":"../node_modules/aurelia-dependency-injection/dist/amd/aurelia-dependency-injection","aurelia-event-aggregator":"../node_modules/aurelia-event-aggregator/dist/amd/aurelia-event-aggregator","aurelia-framework":"../node_modules/aurelia-framework/dist/amd/aurelia-framework","aurelia-history":"../node_modules/aurelia-history/dist/amd/aurelia-history","aurelia-history-browser":"../node_modules/aurelia-history-browser/dist/amd/aurelia-history-browser","aurelia-loader-default":"../node_modules/aurelia-loader-default/dist/amd/aurelia-loader-default","aurelia-logging":"../node_modules/aurelia-logging/dist/amd/aurelia-logging","aurelia-metadata":"../node_modules/aurelia-metadata/dist/amd/aurelia-metadata","aurelia-pal":"../node_modules/aurelia-pal/dist/amd/aurelia-pal","aurelia-pal-browser":"../node_modules/aurelia-pal-browser/dist/amd/aurelia-pal-browser","aurelia-polyfills":"../node_modules/aurelia-polyfills/dist/amd/aurelia-polyfills","aurelia-logging-console":"../node_modules/aurelia-logging-console/dist/amd/aurelia-logging-console","aurelia-path":"../node_modules/aurelia-path/dist/amd/aurelia-path","aurelia-route-recognizer":"../node_modules/aurelia-route-recognizer/dist/amd/aurelia-route-recognizer","aurelia-router":"../node_modules/aurelia-router/dist/amd/aurelia-router","aurelia-task-queue":"../node_modules/aurelia-task-queue/dist/amd/aurelia-task-queue","aurelia-templating-binding":"../node_modules/aurelia-templating-binding/dist/amd/aurelia-templating-binding","aurelia-templating":"../node_modules/aurelia-templating/dist/amd/aurelia-templating","aurelia-http-client":"../node_modules/aurelia-http-client/dist/amd/aurelia-http-client","text":"../node_modules/text/text","aurelia-fetch-client":"../node_modules/aurelia-fetch-client/dist/amd/aurelia-fetch-client","aurelia-loader":"../node_modules/aurelia-loader/dist/amd/aurelia-loader","aurelia-bootstrapper":"../node_modules/aurelia-bootstrapper/dist/amd/aurelia-bootstrapper","app-bundle":"../scripts/app-bundle"},"packages":[{"name":"codemirror","location":"../node_modules/codemirror","main":"lib/codemirror"},{"name":"handsontable","location":"../node_modules/handsontable","main":"dist/handsontable.full"},{"name":"aurelia-templating-resources","location":"../node_modules/aurelia-templating-resources/dist/amd","main":"aurelia-templating-resources"},{"name":"aurelia-testing","location":"../node_modules/aurelia-testing/dist/amd","main":"aurelia-testing"},{"name":"aurelia-templating-router","location":"../node_modules/aurelia-templating-router/dist/amd","main":"aurelia-templating-router"}],"stubModules":["text"],"shim":{},"bundles":{"app-bundle":["app","environment","main","repositoryapp","repositorymain","staffapp","staffmain","components/ariaapi","components/ariaapixhr","components/csrfheaderinterceptor","components/datasettable","components/fileeditor","components/htable","components/importaria","components/messages","components/nmrapi","components/projectapi","components/projecttable","components/searchbydate","components/staffuserinfo","components/userinfo","components/webdavfilepanel","pickerclient/pickerclient","resources/icopy","resources/index","resources/iupload","scientist/createdataset","scientist/dashboard","scientist/dashboarddetail","scientist/repositorytovf","staff/dashboard","staff/dataupload","staff/repositorystaff","staff/upconfirm","staff/upselectdata","staff/upselectdataset","staff/upselectuser","codemirror/mode/clike/clike","codemirror/mode/htmlmixed/htmlmixed","codemirror/mode/xml/xml","codemirror/mode/javascript/javascript","codemirror/mode/css/css","icons","w3","components/heads","components/navigation","components/sharedfooter","components/sharedheader","resources/iadmin","resources/idata","resources/idelete","resources/ifile","resources/ifolder","resources/ilink","resources/inext","resources/iproject","resources/irep","resources/irepdemo","resources/ispincog","resources/istaff","resources/itable"]}})}
5 changes: 2 additions & 3 deletions frontend/src/components/projecttable.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
<th>name</th>
<th>summary</th>
</tr>
<tr show.bind="!selectedProject" class="w3-hover-green" repeat.for="project of projects" >
<tr show.bind="!selectedProject" class="w3-hover-green" repeat.for="project of projects" click.delegate="selectProject(project)">
<td>${project.id}</td>
<td><iproject></iproject><a class="w3-hover-green" route-href="route: projectdetail; params.bind: {projectid:project.id}"
click.delegate="selectProject(project)">${project.projectName}</a></td>
<td><a title="click icon to redirect to project details" class="w3-hover-green" route-href="route: projectdetail; params.bind: {projectid:project.id}"><iproject></iproject></a>${project.projectName}</td>
<td>${project.summary} (${project.datasets})</td>
</tr>
<tr show.bind="selectedProject" title="click to show all projects" class="w3-hover-green" click.delegate="deselectProject()">
Expand Down

0 comments on commit 92d5c28

Please sign in to comment.