diff --git a/src/app/analysisResults/fileList/fileList.tpl.html b/src/app/analysisResults/fileList/fileList.tpl.html index 8008954f..3a78e74d 100644 --- a/src/app/analysisResults/fileList/fileList.tpl.html +++ b/src/app/analysisResults/fileList/fileList.tpl.html @@ -71,9 +71,13 @@

Files

- - No files in this folder - +

+ + + No files in this folder. + + +

diff --git a/src/app/jobs/list/jobsList.js b/src/app/jobs/list/jobsList.js index 2d691867..63713463 100644 --- a/src/app/jobs/list/jobsList.js +++ b/src/app/jobs/list/jobsList.js @@ -17,7 +17,7 @@ angular let controller = this; - this.analysisJobs = []; + this.analysisJobs = null; this.newAnalysisJobRoute = paths.site.ngRoutes.analysisJobs.new; diff --git a/src/app/jobs/list/jobsList.tpl.html b/src/app/jobs/list/jobsList.tpl.html index 6b92c856..c41efeab 100644 --- a/src/app/jobs/list/jobsList.tpl.html +++ b/src/app/jobs/list/jobsList.tpl.html @@ -23,7 +23,15 @@

Audio Analysis

- +
+

+ + + No existing analysis jobs are available to you - try creating a new one. + + +

+
diff --git a/src/app/jobs/new/jobNew.js b/src/app/jobs/new/jobNew.js index 33915e21..4e367f80 100644 --- a/src/app/jobs/new/jobNew.js +++ b/src/app/jobs/new/jobNew.js @@ -22,7 +22,7 @@ class JobNewController { this.analysisJob = new AnalysisJobModel(); // the available scripts - this.scripts = []; + this.scripts = null; // download available scripts ScriptService diff --git a/src/app/jobs/new/jobNew.tpl.html b/src/app/jobs/new/jobNew.tpl.html index b5977cf4..01af3be4 100644 --- a/src/app/jobs/new/jobNew.tpl.html +++ b/src/app/jobs/new/jobNew.tpl.html @@ -99,30 +99,42 @@

2. Select analysis type

- - - + + + {{ script.name }} + + + {{ script.version }} + + + {{ script.description }} + + + + +
diff --git a/src/app/savedSearches/widgets/listSavedSearches.tpl.html b/src/app/savedSearches/widgets/listSavedSearches.tpl.html index 75508426..1e7a235b 100644 --- a/src/app/savedSearches/widgets/listSavedSearches.tpl.html +++ b/src/app/savedSearches/widgets/listSavedSearches.tpl.html @@ -1,7 +1,13 @@
-

No data sets exist. Try creating a new one.

+

+ + + No data sets exist. Try creating a new one. + + +

diff --git a/src/components/services/analysisJob.js b/src/components/services/analysisJob.js index 822b58a3..3e574076 100644 --- a/src/components/services/analysisJob.js +++ b/src/components/services/analysisJob.js @@ -17,130 +17,6 @@ angular function ($resource, bawResource, $http, $q, paths, _, casingTransformers, QueryBuilder, AnalysisJobModel, SavedSearchService, $url) { - /*// FAKED! - let fakedData = [ - { - "id": 11111, - "name": "fake 11111 new fake", - "annotation_name": null, - "custom_settings": "#custom settings 267", - "script_id": 1, - "creator_id": 144, - "updater_id": 144, - "deleter_id": null, - "deleted_at": null, - "created_at": "2016-01-18 06:03:10.047508", - "updated_at": "2016-02-01 06:03:10.093619", - "description": null, - "saved_search_id": 1, - "started_at": "2016-02-18 06:03:10.028024", - "overall_status": "new", - "overall_status_modified_at": "2016-02-18 06:03:10.028276", - "overall_progress": {}, - "overall_progress_modified_at": "2016-02-18 06:03:10.028776", - "overall_count": 66, - "overall_duration_seconds": 6600 - - }, - { - "id": 22222, - "name": "fake 22222 fake fake 22222 fake fake 22222 fake ", - "annotation_name": null, - "custom_settings": "#custom settings 267", - "script_id": 1, - "creator_id": 9, - "updater_id": 144, - "deleter_id": null, - "deleted_at": null, - "created_at": "2016-01-18 06:03:10.047508", - "updated_at": "2016-02-01 06:03:10.093619", - "description": null, - "saved_search_id": 1, - "started_at": "2016-02-18 06:03:10.028024", - "overall_status": "preparing", - "overall_status_modified_at": "2016-02-18 06:03:10.028276", - "overall_progress": {}, - "overall_progress_modified_at": "2016-02-18 06:03:10.028776", - "overall_count": 77, - "overall_duration_seconds": 77700 - - }, - { - "id": 1, - "name": "\"simulate work analysis\" run on the \"All sites in SERF Acoustic Study\" data", - "annotation_name": null, - "custom_settings": "#custom settings 267", - "script_id": 1, - "creator_id": 9, - "updater_id": 9, - "deleter_id": null, - "deleted_at": null, - "created_at": "2016-02-18 06:03:10.047508", - "updated_at": "2016-02-18 06:03:10.093619", - "description": null, - "saved_search_id": 1, - "started_at": "2016-02-18 06:03:10.028024", - "overall_status": "processing", - "overall_status_modified_at": "2016-02-18 06:03:10.028276", - "overall_progress": {"queued": 10, "working": 1, "successful": 35, "failed": 4, "total": 0}, - "overall_progress_modified_at": (new Date()).setMinutes(0, 0, 0), - "overall_count": 50, - "overall_duration_seconds": 88888, - "overall_size_bytes": 123456789 - }, - { - "id": 3600, - "name": "fake 3600 completed fake", - "annotation_name": null, - "custom_settings": "#custom settings 267", - "script_id": 1, - "creator_id": 9, - "updater_id": 144, - "deleter_id": null, - "deleted_at": null, - "created_at": "2016-01-18 06:03:10.047508", - "updated_at": "2016-02-01 06:03:10.093619", - "description": null, - "saved_search_id": 1, - "started_at": "2016-02-18 06:03:10.028024", - "overall_status": "completed", - "overall_status_modified_at": "2016-02-18 06:03:10.028276", - "overall_progress": {"queued": 0, "working": 0, "successful": 90, "failed": 10, "total": 100}, - "overall_progress_modified_at": "2016-02-18 06:03:10.028776", - "overall_count": 100, - "overall_duration_seconds": 100 * 3600 * 2, - "overall_size_bytes": 123456789 - - }, - - { - "id": 99999, - "name": "fake 99999 suspended fake", - "annotation_name": null, - "custom_settings": "#custom settings 267", - "script_id": 1, - "creator_id": 9, - "updater_id": 144, - "deleter_id": null, - "deleted_at": null, - "created_at": "2016-01-18 06:03:10.047508", - "updated_at": "2016-02-01 06:03:10.093619", - "description": null, - "saved_search_id": 1, - "started_at": "2016-02-18 06:03:10.028024", - "overall_status": "suspended", - "overall_status_modified_at": "2016-02-18 06:03:10.028276", - "overall_progress": {"queued": 10, "working": 0, "successful": 80, "failed": 10, "total": 100}, - "overall_progress_modified_at": "2016-02-18 06:03:10.028776", - "overall_count": 99, - "overall_duration_seconds": 99999 - - } - - ]; - fakedData = casingTransformers.transformObject(fakedData, casingTransformers.camelize); - */ - function query() { const url = paths.api.routes.analysisJobs.listAbsolute; return $http