-
Sorry, something went wrong. Try reloading the page.
+Sorry, something went wrong. Try reloading the page.
Export in progress...
You can leave this page if you want. Your export will continue.
We will let you know when we're done.
", "no_fields": "Uh oh... you need to select some fields to export first.", "expires": "Expires: {{expires}}", "job": "CSV Export {{jobId}}", @@ -1217,8 +1247,65 @@ "pending": "Status: Pending", "failed": "Status: Failed", "queued": "Status: In Progress", - "export": "Export", - "export_history": "Export History" + "pending_hdx": "Pending HDX", + "exported_to_cdn": "Exported to CDN", + "tags_attributes": "Assign tags and attributes", + "hxl_apikey_alert_1": "It looks like you haven't set up your Humanitarian Data Exchange (HDX) API. Without this set up, you can't tag data and upload to a Humanitarian Data Exchange (HDX) account.", + "hxl_configure": "Configure HDX API", + "hxl_apikey_alert_2": "We strongly advide you set this up now in", + "hxl_apikey_alert_3": "before continuing as you won't be able to upload your data to HDX", + "hxl_title": "Assign your HXL tags and attributes, select fields and export or upload", + "hxl_desc": "Select specific fields from a survey, assign a tag per field and then choose to assign multiple attributes. Preview your tag and attributes in tag preview.", + "hxl_instructions_1": "You can then choose to export your tagged fields to a CSV file or upload to a", + "hxl_instructions_2": "Humanitarian Data Exchange (HDX)", + "hxl_instructions_3": "account that has been set up in", + "hxl_instructions_4": "Configure HDX API", + "hxl_instructions_5": "(found in settings menu).", + "hxl_instructions_6": "Visit the", + "hxl_instructions_7": "HXL tag assist", + "hxl_instructions_8": "for more information on how to choose the best HXL tags and attributes for your data or the", + "hxl_instructions_9": "HXL 'cheat sheet'", + "HXL_tags": "HXL tags", + "HXL_attributes": "HXL attributes", + "tag_preview": "Tag preview", + "upload_title": "Are you ready to upload to an Humanitarian Data Exchange (HDX) account?", + "hdx_csv_title": "Are you ready to export to CSV?", + "upload_desc": "You selected {{fields}} fields to upload to a Humanitarian Data Exchange (HDX) account.notify.default.proceed_warning
' + '' + `` + 'notify.default.proceed_warning
+ + +'; + message = '
'; action = { callback: cancelExport, text: 'notify.export.cancel_export', @@ -136,11 +145,11 @@ function DataExport($rootScope, ExportJobEndpoint, Notify, $window, $timeout, $ icon = 'ellipses'; loading = true; } else { - message = '
'; + + message = job && job.send_to_hdx ? '' : ''; icon = 'thumb-up'; loading = false; } - Notify.notifyAction(message, null, loading, icon, 'circle-icon confirmation', action); } } @@ -189,6 +198,7 @@ function DataExport($rootScope, ExportJobEndpoint, Notify, $window, $timeout, $ loadExportJobs: loadExportJobs, processExportJobs: processExportJobs, setExportJobs: setExportJobs, - getExportJobs: getExportJobs + getExportJobs: getExportJobs, + loadingStatus: loadingStatus }; } diff --git a/app/common/services/endpoints/hxl-license-endpoint.js b/app/common/services/endpoints/hxl-license-endpoint.js new file mode 100644 index 0000000000..307f6692e4 --- /dev/null +++ b/app/common/services/endpoints/hxl-license-endpoint.js @@ -0,0 +1,25 @@ +module.exports = [ + '$resource', + 'Util', +function ( + $resource, + Util +) { + + var HxlLicenseEndpoint = $resource(Util.apiUrl('/hxl/licenses'), { + id: '@id' + }, { + get: { + method: 'GET' + }, + update: { + method: 'PUT' + }, + deleteEntity: { + method: 'DELETE' + } + }); + + return HxlLicenseEndpoint; + +}]; diff --git a/app/common/services/endpoints/hxl-metadata-endpoint.js b/app/common/services/endpoints/hxl-metadata-endpoint.js new file mode 100644 index 0000000000..14dac5986f --- /dev/null +++ b/app/common/services/endpoints/hxl-metadata-endpoint.js @@ -0,0 +1,25 @@ +module.exports = [ + '$resource', + 'Util', +function ( + $resource, + Util +) { + + var HxlMetadataEndpoint = $resource(Util.apiUrl('/hxl/metadata'), { + id: '@id' + }, { + get: { + method: 'GET' + }, + update: { + method: 'PUT' + }, + deleteEntity: { + method: 'DELETE' + } + }); + + return HxlMetadataEndpoint; + +}]; diff --git a/app/common/services/endpoints/hxl-organisations-endpoint.js b/app/common/services/endpoints/hxl-organisations-endpoint.js new file mode 100644 index 0000000000..07dd3c0123 --- /dev/null +++ b/app/common/services/endpoints/hxl-organisations-endpoint.js @@ -0,0 +1,25 @@ +module.exports = [ + '$resource', + 'Util', +function ( + $resource, + Util +) { + + var HxlOrganisationsEndpoint = $resource(Util.apiUrl('/hxl/organisations'), { + id: '@id' + }, { + get: { + method: 'GET' + }, + update: { + method: 'PUT' + }, + deleteEntity: { + method: 'DELETE' + } + }); + + return HxlOrganisationsEndpoint; + +}]; diff --git a/app/common/services/endpoints/hxl-tag-endpoint.js b/app/common/services/endpoints/hxl-tag-endpoint.js new file mode 100644 index 0000000000..832406d07b --- /dev/null +++ b/app/common/services/endpoints/hxl-tag-endpoint.js @@ -0,0 +1,25 @@ +module.exports = [ + '$resource', + 'Util', +function ( + $resource, + Util +) { + + var HxlTagEndpoint = $resource(Util.apiUrl('/hxl/tags'), { + id: '@id' + }, { + get: { + method: 'GET' + }, + update: { + method: 'PUT' + }, + deleteEntity: { + method: 'DELETE' + } + }); + + return HxlTagEndpoint; + +}]; diff --git a/app/common/services/endpoints/user-settings.js b/app/common/services/endpoints/user-settings.js new file mode 100644 index 0000000000..5118aced13 --- /dev/null +++ b/app/common/services/endpoints/user-settings.js @@ -0,0 +1,71 @@ +module.exports = [ + '$resource', + '$rootScope', + 'Util', + 'CacheFactory', +function ( + $resource, + $rootScope, + Util, + CacheFactory +) { + var cache; + + if (!(cache = CacheFactory.get('userSettingsCache'))) { + cache = CacheFactory.createCache('userSettingsCache'); + } + cache.removeExpired(); + + var UserSettingsEndpoint = $resource(Util.apiUrl('/users/:id/settings/:keyId'), { + id: '@user_id', + keyId: '@id' + }, { + query: { + method: 'GET', + isArray: false, + paramSerializer: '$httpParamSerializerJQLike', + transformResponse: function (data /*, header*/) { + return angular.fromJson(data); + }, + cache: cache + }, + get: { + method: 'GET', + cache: cache + }, + update: { + method: 'PUT' + }, + deleteEntity: { + method: 'DELETE' + } + }); + + UserSettingsEndpoint.getFresh = function (params) { + cache.remove(Util.apiUrl('/users/' + params.id + '/settings')); + return UserSettingsEndpoint.get(params); + }; + + UserSettingsEndpoint.invalidateCache = function () { + return cache.removeAll(); + }; + + UserSettingsEndpoint.queryFresh = function (params) { + cache.removeAll(); + return UserSettingsEndpoint.query(params); + }; + + UserSettingsEndpoint.saveCache = function (item) { + var persist = item.id ? UserSettingsEndpoint.update : UserSettingsEndpoint.save; + cache.removeAll(); + return persist(item); + }; + + UserSettingsEndpoint.delete = function (item) { + cache.removeAll(); + var result = UserSettingsEndpoint.deleteEntity(item); + return result; + }; + + return UserSettingsEndpoint; +}]; diff --git a/app/common/services/hxl-export.service.js b/app/common/services/hxl-export.service.js new file mode 100644 index 0000000000..5aed8d3419 --- /dev/null +++ b/app/common/services/hxl-export.service.js @@ -0,0 +1,49 @@ +module.exports = HxlExport; + +HxlExport.$inject = ['$rootScope', 'HxlTagEndpoint', 'FormEndpoint', 'FormAttributeEndpoint', '_']; + +function HxlExport($rootScope, HxlTagEndpoint, FormEndpoint, FormAttributeEndpoint, _) { + + function getFormsWithTags() { + return getTags(); + } + + function getTags() { + return HxlTagEndpoint.get().$promise.then((tags)=> { + return getForms(tags.results); + }); + } + + function getForms(tags) { + // requesting forms + return FormEndpoint.queryFresh({targeted_survey: false}).$promise.then(function (response) { + return attachAttributes(response, tags); + }); + } + + function attachAttributes(forms, tags) { + // requesting attributes and attaches them to the correct form + return _.each(forms, function (form) { + return FormAttributeEndpoint.query({formId: form.id}).$promise.then(function (response) { + form.attributes = response; + return attachTagsToAttributes(form, tags); + }); + }); + } + + function attachTagsToAttributes(form, tags) { + // attaching hxl-tags to each attribute + _.each(form.attributes, (attribute) => { + attribute.tags = []; + _.each(tags, (tag) => { + _.each(tag.form_attribute_types, (type) => { + if (type.form_attribute_type === attribute.type) { + attribute.tags.push(tag); + } + }); + }); + }); + return form; + } + return { getFormsWithTags }; +} diff --git a/app/index.html b/app/index.html index 7b5ac5b75a..c83fb9dba7 100644 --- a/app/index.html +++ b/app/index.html @@ -32,7 +32,7 @@Sorry, something went wrong. Try reloading the page.
+Sorry, something went wrong. Try reloading the page.