From c09a8eb5a6f3088970e38fe906a1d89ee3e96aaa Mon Sep 17 00:00:00 2001 From: Enieber Cunha Date: Thu, 27 Jun 2024 16:55:31 -0300 Subject: [PATCH] =?UTF-8?q?fix:=20corre=C3=A7=C3=A3o=20de=20textos=20usado?= =?UTF-8?q?s=20no=20thema?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/mapas/config/routes.php | 4 +- .../assets/js/media-query.js.LICENSE.txt | 7 + .../complaint-suggestion/template.php | 12 +- .../components/mc-loading/template.php | 4 +- .../registration-actions/template.php | 14 +- .../Metabase/assets/css/plugin-metabase.css | 239 +----------------- .../src/plugins/plugin-MultipleLocalAuth | 2 +- api/mapas/src/pnpm-lock.yaml | 4 +- .../themes/BaseV1/assets/img/logo-mapas.png | Bin 0 -> 40999 bytes .../assets/js/ng.entity.module.opportunity.js | 190 +++++++------- .../sass/2.components/_mc-loading.scss | 8 +- api/mapas/src/translations/pt-br.php | 4 +- 12 files changed, 133 insertions(+), 355 deletions(-) create mode 100644 api/mapas/src/modules/Components/assets/js/media-query.js.LICENSE.txt create mode 100644 api/mapas/src/themes/BaseV1/assets/img/logo-mapas.png diff --git a/api/mapas/config/routes.php b/api/mapas/config/routes.php index f9590c9fdb..2fc16388c6 100644 --- a/api/mapas/config/routes.php +++ b/api/mapas/config/routes.php @@ -11,7 +11,7 @@ 'agentes' => ['search', 'agents'], 'eventos' => ['search', 'events'], 'espacos' => ['search', 'spaces'], - 'oportunidades' => ['search', 'opportunities'], + 'edital' => ['search', 'opportunities'], 'projetos' => ['search', 'projects'], // entidades @@ -126,7 +126,7 @@ 'agent' => i::__('Agente'), 'agents' => i::__('Agentes'), 'space' => i::__('Espaço'), 'spaces' => i::__('Espaços'), 'project' => i::__('Projeto'), 'projects' => i::__('Projetos'), - 'opportunity' => i::__('Oportunidade'), 'opportunities' => i::__('Oportunidades'), + 'opportunity' => i::__('Edital'), 'opportunities' => i::__('Edital'), 'registration' => i::__('Inscrição'), 'registrations' => i::__('Inscrições'), 'file' => i::__('Arquivo'), 'files' => i::__('Arquivos'), 'seal' => i::__('Selo'), 'seals' => i::__('Selos'), diff --git a/api/mapas/src/modules/Components/assets/js/media-query.js.LICENSE.txt b/api/mapas/src/modules/Components/assets/js/media-query.js.LICENSE.txt new file mode 100644 index 0000000000..961c336e8a --- /dev/null +++ b/api/mapas/src/modules/Components/assets/js/media-query.js.LICENSE.txt @@ -0,0 +1,7 @@ +/*! #__NO_SIDE_EFFECTS__ */ + +/** +* @vue/shared v3.4.27 +* (c) 2018-present Yuxi (Evan) You and Vue contributors +* @license MIT +**/ diff --git a/api/mapas/src/modules/Components/components/complaint-suggestion/template.php b/api/mapas/src/modules/Components/components/complaint-suggestion/template.php index 200f4ccfd8..b83b202910 100644 --- a/api/mapas/src/modules/Components/components/complaint-suggestion/template.php +++ b/api/mapas/src/modules/Components/components/complaint-suggestion/template.php @@ -6,7 +6,7 @@ use MapasCulturais\i; -$this->import(" +$this->import(" mc-modal "); ?> @@ -54,7 +54,8 @@ - + +
+
-
+ \ No newline at end of file +
diff --git a/api/mapas/src/modules/Components/components/mc-loading/template.php b/api/mapas/src/modules/Components/components/mc-loading/template.php index ad72b62bed..bb3c691c7e 100644 --- a/api/mapas/src/modules/Components/components/mc-loading/template.php +++ b/api/mapas/src/modules/Components/components/mc-loading/template.php @@ -7,5 +7,5 @@ use MapasCulturais\i; ?> - {{entity?.__processing || ''}} - \ No newline at end of file + {{entity?.__processing || ''}} + diff --git a/api/mapas/src/modules/Opportunities/components/registration-actions/template.php b/api/mapas/src/modules/Opportunities/components/registration-actions/template.php index 2e5c5e2bb6..0715a3b707 100644 --- a/api/mapas/src/modules/Opportunities/components/registration-actions/template.php +++ b/api/mapas/src/modules/Opportunities/components/registration-actions/template.php @@ -15,11 +15,11 @@
- +
{{fieldName(index)}}:

{{text}}

-
+
@@ -28,22 +28,22 @@ - + - +
- + - +
- \ No newline at end of file + diff --git a/api/mapas/src/plugins/Metabase/assets/css/plugin-metabase.css b/api/mapas/src/plugins/Metabase/assets/css/plugin-metabase.css index 7a0ad21fee..b415e303f2 100644 --- a/api/mapas/src/plugins/Metabase/assets/css/plugin-metabase.css +++ b/api/mapas/src/plugins/Metabase/assets/css/plugin-metabase.css @@ -1,238 +1 @@ -/* ----- 1: SETTINGS ------- */ -/* ----- 2: ATOMS ------- */ -/* ----- 3: LAYOUT ------- */ -/* ----- 4: COMPONENTS ------- */ -.list-dashboard { - background-color: var(--mc-white); - color: var(--mc-black); - display: grid; - grid-template-columns: 19.0625rem calc(100% - 19.0625rem); - max-width: 90rem; - margin: 0 auto; -} -.list-dashboard .selected { - background-color: var(--mc-primary-500); -} -.list-dashboard__title { - color: var(--mc-gray-700); - font-size: 0.75rem; - margin: 0 auto; - padding: 1rem 1rem 1rem 0; - text-transform: uppercase; -} -.list-dashboard__text { - font-size: 0.875rem; - color: var(); -} -.list-dashboard .textselected { - color: var(--mc-white); -} -.list-dashboard__link { - color: var(--mc-black); - text-decoration: none; -} -.list-dashboard__link a { - text-decoration: none; -} -.list-dashboard__nav { - list-style-type: none; - background-color: var(--mc-white); - padding: 1rem 2rem 1rem 1.5rem; - margin: 0; - border-right: 1px solid var(--mc-gray-100); - display: flex; - gap: 0.5rem; - flex-direction: column; -} -.list-dashboard__iframe { - height: 100%; - width: 100%; - border-style: none; -} -.list-dashboard__item { - padding: 0.5rem 1rem 0.5rem 1rem; - margin: 0; - border-radius: 0.25rem; - width: 15.625rem; - background-color: var(--mc-white); - color: var(--mc-black); -} - -.home-metabase { - margin: 0 auto; - background-color: var(--mc-home-opportunities); - padding: 3.75rem 1rem; - position: relative; - display: flex; - align-items: center; - overflow: hidden; - flex-direction: column; -} -.home-metabase__header { - margin: 0 auto; - max-width: 73.125rem; - width: 100%; - display: grid; - align-items: center; - grid-template-columns: 1fr 28.4375rem; -} -@media (max-width: 37.5rem) { - .home-metabase__header { - display: flex; - flex-direction: column; - align-items: center; - } -} -.home-metabase__left { - color: var(--mc-white); - display: flex; - flex-direction: column; - gap: 1rem; - align-items: flex-start; -} -@media (max-width: 37.5rem) { - .home-metabase__left { - align-items: center; - } -} -@media (max-width: 37.5rem) { - .home-metabase__text { - text-align: center; - } -} -.home-metabase__img { - width: 17.8125rem; - max-width: 100%; -} -.home-metabase__panel { - display: flex; - flex-direction: column; - gap: 0.75rem; -} -.home-metabase__subtitle { - color: var(--mc-white); -} -.home-metabase__content { - align-items: stretch; - display: flex; - flex-direction: row; - flex-wrap: wrap; - margin: 0 auto; - max-width: 73.125rem; - z-index: 2; - gap: 1.125rem 0.8125rem; -} -@media (max-width: 31.25rem) { - .home-metabase__content { - gap: 1.125rem 0; - } -} - -.metabase-dashboard { - padding-inline: 7.4375rem; - background-color: var(--mc-gray-100); - max-width: 90rem; - margin: 0 auto; -} -@media (max-width: 31.25rem) { - .metabase-dashboard { - padding-inline: 1rem; - } -} -.metabase-dashboard__page { - background-color: var(--mc-gray-100); -} -.metabase-dashboard__header { - display: flex; - flex-direction: column; - padding: 2.5rem 0 1rem 0; -} -.metabase-dashboard__content { - display: flex; - flex-direction: row; - flex-wrap: wrap; - gap: 1.5rem; - padding-bottom: 13.5rem; -} -.metabase-dashboard__card { - display: inline-flex; - padding: 16px 35px 16px 16px; - flex-direction: column; - align-items: flex-start; - gap: 6px; - max-width: 23.0625rem; - border-radius: 8px; - border: 1px solid var(--mc-gray-100); - background: var(--mc-white); -} - -.metabase-card { - width: 23.1875rem; - max-width: 100%; - background-color: var(--mc-white); - border: 0.0625rem solid var(--mc-gray-100); - padding: 1rem; - border-radius: 0.5rem; - display: grid; - align-content: space-between; -} -.metabase-card__header { - display: grid; - grid-template-columns: 2rem 1fr; - gap: 1rem; -} -.metabase-card__icon { - background-color: var(--mc-white); - font-size: 1.5rem; - justify-self: center; -} -.metabase-card__content { - display: grid; - grid-template-columns: 1fr; - align-items: end; - text-align: center; - gap: 1.625rem; -} -.metabase-card__number { - font-size: var(--mc-font-size-lg); -} -.metabase-card__label { - font-weight: 600; -} -.metabase-card__info { - display: flex; - flex-direction: column; - align-items: center; - text-align: center; - margin: 1.125rem 0; -} -.metabase-card__number { - font-size: var(--mc-font-size-xl); -} -.metabase-card__number--long { - font-size: var(--mc-font-size-sm); -} -.metabase-card--double .metabase-card__content { - grid-template-columns: 1fr 1fr; -} -.metabase-card--double .metabase-card__info:first-of-type .metabase-card__number { - font-size: var(--mc-font-size-lg); -} -.metabase-card--double .metabase-card__info:first-of-type .metabase-card__number--long { - font-size: var(--mc-font-size-sm); -} -.metabase-card--double .metabase-card__number { - font-size: var(--mc-font-size-md); -} -@media (max-width: 31.25rem) { - .metabase-card { - min-width: 18.5625rem; - width: 100%; - } -} - -.controller-metabase { - background-color: var(--mc-gray-100); -} - -/* ----- 5: AREAS ------- */ +.list-dashboard{background-color:var(--mc-white);color:var(--mc-black);display:grid;grid-template-columns:19.0625rem calc(100% - 19.0625rem);margin:0 auto;max-width:90rem}.list-dashboard .selected{background-color:var(--mc-primary-500)}.list-dashboard__title{color:var(--mc-gray-700);font-size:.75rem;margin:0 auto;padding:1rem 1rem 1rem 0;text-transform:uppercase}.list-dashboard__text{color:var();font-size:.875rem}.list-dashboard .textselected{color:var(--mc-white)}.list-dashboard__link{color:var(--mc-black);text-decoration:none}.list-dashboard__link a{text-decoration:none}.list-dashboard__nav{background-color:var(--mc-white);border-right:1px solid var(--mc-gray-100);display:flex;flex-direction:column;gap:.5rem;list-style-type:none;margin:0;padding:1rem 2rem 1rem 1.5rem}.list-dashboard__iframe{border-style:none;height:100%;width:100%}.list-dashboard__item{background-color:var(--mc-white);border-radius:.25rem;color:var(--mc-black);margin:0;padding:.5rem 1rem;width:15.625rem}.home-metabase{align-items:center;background-color:var(--mc-home-opportunities);display:flex;flex-direction:column;margin:0 auto;overflow:hidden;padding:3.75rem 1rem;position:relative}.home-metabase__header{align-items:center;display:grid;grid-template-columns:1fr 28.4375rem;margin:0 auto;max-width:73.125rem;width:100%}@media (max-width:37.5rem){.home-metabase__header{align-items:center;display:flex;flex-direction:column}}.home-metabase__left{align-items:flex-start;color:var(--mc-white);display:flex;flex-direction:column;gap:1rem}@media (max-width:37.5rem){.home-metabase__left{align-items:center}.home-metabase__text{text-align:center}}.home-metabase__img{max-width:100%;width:17.8125rem}.home-metabase__panel{display:flex;flex-direction:column;gap:.75rem}.home-metabase__subtitle{color:var(--mc-white)}.home-metabase__content{align-items:stretch;display:flex;flex-direction:row;flex-wrap:wrap;gap:1.125rem .8125rem;margin:0 auto;max-width:73.125rem;z-index:2}@media (max-width:31.25rem){.home-metabase__content{gap:1.125rem 0}}.metabase-dashboard{background-color:var(--mc-gray-100);margin:0 auto;max-width:90rem;padding-inline:7.4375rem}@media (max-width:31.25rem){.metabase-dashboard{padding-inline:1rem}}.metabase-dashboard__page{background-color:var(--mc-gray-100)}.metabase-dashboard__header{display:flex;flex-direction:column;padding:2.5rem 0 1rem}.metabase-dashboard__content{display:flex;flex-direction:row;flex-wrap:wrap;gap:1.5rem;padding-bottom:13.5rem}.metabase-dashboard__card{align-items:flex-start;background:var(--mc-white);border:1px solid var(--mc-gray-100);border-radius:8px;display:inline-flex;flex-direction:column;gap:6px;max-width:23.0625rem;padding:16px 35px 16px 16px}.metabase-card{align-content:space-between;background-color:var(--mc-white);border:.0625rem solid var(--mc-gray-100);border-radius:.5rem;display:grid;max-width:100%;padding:1rem;width:23.1875rem}.metabase-card__header{display:grid;gap:1rem;grid-template-columns:2rem 1fr}.metabase-card__icon{background-color:var(--mc-white);font-size:1.5rem;justify-self:center}.metabase-card__content{align-items:end;display:grid;gap:1.625rem;grid-template-columns:1fr;text-align:center}.metabase-card__number{font-size:var(--mc-font-size-lg)}.metabase-card__label{font-weight:600}.metabase-card__info{align-items:center;display:flex;flex-direction:column;margin:1.125rem 0;text-align:center}.metabase-card__number{font-size:var(--mc-font-size-xl)}.metabase-card__number--long{font-size:var(--mc-font-size-sm)}.metabase-card--double .metabase-card__content{grid-template-columns:1fr 1fr}.metabase-card--double .metabase-card__info:first-of-type .metabase-card__number{font-size:var(--mc-font-size-lg)}.metabase-card--double .metabase-card__info:first-of-type .metabase-card__number--long{font-size:var(--mc-font-size-sm)}.metabase-card--double .metabase-card__number{font-size:var(--mc-font-size-md)}@media (max-width:31.25rem){.metabase-card{min-width:18.5625rem;width:100%}}.controller-metabase{background-color:var(--mc-gray-100)} diff --git a/api/mapas/src/plugins/plugin-MultipleLocalAuth b/api/mapas/src/plugins/plugin-MultipleLocalAuth index 83c36d73b2..6ef8cfc687 160000 --- a/api/mapas/src/plugins/plugin-MultipleLocalAuth +++ b/api/mapas/src/plugins/plugin-MultipleLocalAuth @@ -1 +1 @@ -Subproject commit 83c36d73b29e47b36ea34c37dff5417fbbd15c3f +Subproject commit 6ef8cfc6876985811fdd7e83bbfce0b2d42bad34 diff --git a/api/mapas/src/pnpm-lock.yaml b/api/mapas/src/pnpm-lock.yaml index 8d6aa89a8e..3330e7c934 100644 --- a/api/mapas/src/pnpm-lock.yaml +++ b/api/mapas/src/pnpm-lock.yaml @@ -112,7 +112,7 @@ importers: version: 1.77.2 sass-loader: specifier: ^8.0.2 - version: 8.0.2(sass@1.77.2)(webpack@4.47.0(webpack-cli@3.3.12(webpack@4.47.0(webpack-cli@4.10.0(webpack@5.91.0))))) + version: 8.0.2(sass@1.77.2)(webpack@5.91.0(webpack-cli@4.10.0(webpack@5.91.0))) plugins/plugin-MultipleLocalAuth: devDependencies: @@ -127,7 +127,7 @@ importers: version: 1.77.2 sass-loader: specifier: ^8.0.2 - version: 8.0.2(sass@1.77.2)(webpack@5.91.0(webpack-cli@4.10.0(webpack@5.91.0))) + version: 8.0.2(sass@1.77.2)(webpack@4.47.0(webpack-cli@3.3.12(webpack@4.47.0(webpack-cli@4.10.0(webpack@5.91.0))))) themes/BaseV2: devDependencies: diff --git a/api/mapas/src/themes/BaseV1/assets/img/logo-mapas.png b/api/mapas/src/themes/BaseV1/assets/img/logo-mapas.png new file mode 100644 index 0000000000000000000000000000000000000000..d411436eab0b91773e5c3a5cefd859e1923bf405 GIT binary patch literal 40999 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 WIdvFJ_2rynoEMre!6oW;A^!uytQ33z literal 0 HcmV?d00001 diff --git a/api/mapas/src/themes/BaseV1/assets/js/ng.entity.module.opportunity.js b/api/mapas/src/themes/BaseV1/assets/js/ng.entity.module.opportunity.js index 58db2aaef8..34e672cedc 100644 --- a/api/mapas/src/themes/BaseV1/assets/js/ng.entity.module.opportunity.js +++ b/api/mapas/src/themes/BaseV1/assets/js/ng.entity.module.opportunity.js @@ -105,11 +105,11 @@ error(function(data, status){ $rootScope.$emit('error', {message: "Cannot validate opportunity registration", data: data, status: status}); }); - }, + }, updateFields: function(entity) { var data = {}; - + Object.keys(entity).forEach(function(key) { // para excluir propriedades do angular if(key.indexOf('$$') == -1){ @@ -122,7 +122,7 @@ } } }); - + return $http.patch(this.getUrl('single', entity.id), data, {headers: {forceSave: true}}). success(function(data, status){ MapasCulturais.Messages.success(labels['changesSaved']); @@ -180,13 +180,13 @@ }, getSelectedCategory: function(){ - + return $q(function(resolve){ setTimeout(function(){ var $field = jQuery('#category select'); if($field.length){ - resolve($field.val()); + resolve($field.val()); }else{ resolve(MapasCulturais.entity.object.category); } @@ -201,7 +201,7 @@ },50) }); }, - + registrationStatuses: MapasCulturais.entity.registrationStatuses, registrationStatusesToFilter: [{label: 'Todos os status', value: undefined}, ...MapasCulturais.entity.registrationStatuses], @@ -295,7 +295,7 @@ module.factory('EvaluationMethodConfigurationService', ['$rootScope', '$q', '$ht ); return deferred.promise; }, - + reopenEvaluationsV2: function(data){ let url = MapasCulturais.createUrl('opportunity', 'reopenEvaluations'); var deferred = $q.defer(); @@ -320,7 +320,7 @@ module.factory('EvaluationMethodConfigurationService', ['$rootScope', '$q', '$ht }; }]); -module.controller('RegistrationConfigurationsController', ['$scope', '$rootScope', '$timeout', '$interval', 'UrlService', 'RegistrationConfigurationService', 'EditBox', '$http', function ($scope, $rootScope, $timeout, $interval, UrlService, RegistrationConfigurationService, EditBox, $http) { +module.controller('RegistrationConfigurationsController', ['$scope', '$rootScope', '$timeout', '$interval', 'UrlService', 'RegistrationConfigurationService', 'EditBox', '$http', function ($scope, $rootScope, $timeout, $interval, UrlService, RegistrationConfigurationService, EditBox, $http) { var fileService = RegistrationConfigurationService('registrationfileconfiguration'); var fieldService = RegistrationConfigurationService('registrationfieldconfiguration'); @@ -449,7 +449,7 @@ module.controller('RegistrationConfigurationsController', ['$scope', '$rootScope registrationRanges : MapasCulturais.entity.object.registrationRanges, proponentTypes : MapasCulturais.entity.object.registrationProponentTypes, }; - + $scope.allowedFieldCondition = function(type){ let notAllowed = ['section', 'file']; if(!notAllowed.includes(type.fieldType)){ @@ -463,7 +463,7 @@ module.controller('RegistrationConfigurationsController', ['$scope', '$rootScope if(jQuery('#registration-categories').length) { $interval(function(){ - var $field = jQuery('#registration-categories .js-categories-values'); + var $field = jQuery('#registration-categories .js-categories-values'); if ($field.hasClass('editable-empty')) { $scope.data.categories = []; } else { @@ -542,7 +542,7 @@ module.controller('RegistrationConfigurationsController', ['$scope', '$rootScope return; } } - + if($scope.data.newFieldConfiguration.fieldType == "section"){ $scope.data.newFieldConfiguration.required = false; } @@ -576,7 +576,7 @@ module.controller('RegistrationConfigurationsController', ['$scope', '$rootScope $scope.editFieldConfiguration = function(attrs) { var labels = MapasCulturais.gettext.moduleOpportunity; var model = $scope.data.fields[attrs.index]; - + var field_types_entity_list = []; Object.values(MapasCulturais.registrationFieldTypes).forEach(function(item){ if(item.name.match(/^@[a-zA-Z0-9\- ]{1,90}/)){ @@ -602,12 +602,12 @@ module.controller('RegistrationConfigurationsController', ['$scope', '$rootScope } } - + if(!model.conditional){ model.conditionalField = ''; model.conditionalValue = ''; } - + var data = { id: model.id, title: model.title, @@ -711,7 +711,7 @@ module.controller('RegistrationConfigurationsController', ['$scope', '$rootScope model.conditionalField = ''; model.conditionalValue = ''; } - + var data = { id: model.id, title: model.title, @@ -985,7 +985,7 @@ module.controller('EvaluationsFieldsConfigController', ['$scope', 'EvaluationsFi $scope.data = { fields: [], avaliableEvaluationFields: {}, - + projectName:{ fieldName: "projectName", checked: false, @@ -1007,7 +1007,7 @@ module.controller('EvaluationsFieldsConfigController', ['$scope', 'EvaluationsFi } $scope.evaluationsFieldsFilter = ""; - + $scope.selectFields = function(field){ var labels = MapasCulturais.gettext.moduleOpportunity; $scope.data.avaliableEvaluationFields = {} @@ -1025,7 +1025,7 @@ module.controller('EvaluationsFieldsConfigController', ['$scope', 'EvaluationsFi }); EvaluationsFieldsConfigService.save($scope.data.avaliableEvaluationFields).success(function(r) { - MapasCulturais.Messages.success(labels['successFullySaved']); + MapasCulturais.Messages.success(labels['successFullySaved']); }); } @@ -1062,7 +1062,7 @@ module.controller('EvaluationsFieldsConfigController', ['$scope', 'EvaluationsFi // if(MapasCulturais.entity.object.avaliableEvaluationFields["category"] != "true" && item.categories?.length > 0){ // item.disabled = true; // item.titleDisabled = labels['activateField']; - + // } var field_condition = item.config?.require?.field; @@ -1127,9 +1127,9 @@ module.controller('EvaluationsFieldsConfigController', ['$scope', 'EvaluationsFi EvaluationsFieldsConfigService.save($scope.data.avaliableEvaluationFields).success(function(r) { if($scope.hasDisabled && $scope.data.allFields.checked){ - MapasCulturais.Messages.alert(labels['fieldsDisabled']); + MapasCulturais.Messages.alert(labels['fieldsDisabled']); }else{ - MapasCulturais.Messages.success(labels['successFullySaved']); + MapasCulturais.Messages.success(labels['successFullySaved']); } }); @@ -1168,7 +1168,7 @@ module.controller('EvaluationsFieldsConfigController', ['$scope', 'EvaluationsFi } }); } - + $scope.filter = function(field){ if((field.title.toLowerCase().indexOf($scope.evaluationsFieldsFilter.toLowerCase()) >= 0) || (field.ref.toLowerCase().indexOf("field_"+$scope.evaluationsFieldsFilter.replace('#', '').toLowerCase()) >= 0)){ field.filterActive = true; @@ -1180,7 +1180,7 @@ module.controller('EvaluationsFieldsConfigController', ['$scope', 'EvaluationsFi module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$interval', '$timeout', 'RelatedAgentsService', 'RegistrationService', 'RegistrationConfigurationService', 'EditBox', '$http', 'UrlService', function ($scope, $rootScope, $interval, $timeout, RelatedAgentsService, RegistrationService, RegistrationConfigurationService, EditBox, $http, UrlService) { window.$registrationScope = $scope; - + var registrationsUrl = new UrlService('registration'); var labels = MapasCulturais.gettext.moduleOpportunity; @@ -1206,7 +1206,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int $scope.data.fileConfigurations.forEach(function(item){ item.file = MapasCulturais.entity.registrationFiles[item.groupName]; }); - + $scope.data.fields = RegistrationService.getFields(); $scope.data.fieldsRequiredLabel = labels['requiredLabel']; $scope.data.fieldsOptionalLabel = labels['optionalLabel']; @@ -1221,7 +1221,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int } } - field.unchangedFieldJSON = JSON.stringify(val); + field.unchangedFieldJSON = JSON.stringify(val); if (field.fieldType == 'date' && typeof val == 'string' ) { val = moment(val).toDate(); @@ -1240,7 +1240,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int id: MapasCulturais.registration.id }; $scope.saveField = function (field, value, delay) { - + if(field.fieldType === "agent-owner-field") { var definition = MapasCulturais.EntitiesDescription.agent[field.config.entityField]; if(definition?.type == "multiselect"){ @@ -1254,7 +1254,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int $scope.data.editableEntity[field.fieldName] = value !== undefined ? JSON.parse(angular.toJson(value)) : null; $timeout.cancel(saveTimeout); - + saveTimeout = $timeout(function(){ if(MapasCulturais.isEditable){ $scope.saveRegistration(); @@ -1296,11 +1296,11 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int }else{ MapasCulturais.Messages.error(labels['unexpectedError']); } - }) + }) } window.$registrationScope = $scope; - + function replaceRegistrationAgentBy(groupName, agent, relationStatus){ for(var i in MapasCulturais.entity.registrationAgents){ var def = MapasCulturais.entity.registrationAgents[i]; @@ -1317,15 +1317,15 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int $scope.data.editableEntity['ownerId'] = agent.id; $timeout.cancel(saveTimeout); - + saveTimeout = $timeout(function(){ $scope.saveRegistration(); }, MapasCulturais.registrationAutosaveTimeout); - + replaceRegistrationAgentBy('owner', agent); EditBox.close('editbox-select-registration-owner'); - }; + }; $scope.setRegistrationAgent = function(entity, attrs){ if(attrs.name === 'owner'){ @@ -1372,18 +1372,18 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int if($('#registration-space-title :first-child').hasClass('danger')){ $('#registration-space-title :first-child').remove(); } - + try{ controllerId = MapasCulturais.request.controller; }catch (e){}; try{ entityId = MapasCulturais.entity.id; }catch (e){}; var createSpaceRelationUrl = baseUrl + controllerId + '/' + controllerName + '/' + entityId; - + $http.post(createSpaceRelationUrl, {id: spaceId}). success(function(response, status){ if(status === 202){ MapasCulturais.Messages.alert(labels['spaceRelationRequestSent'].replace('{{space}}', ''+response.space.name+'')); } - + if(response.space.avatar && response.space.avatar.avatarSmall){ response.space.avatarUrl = response.space.avatar.avatarSmall.url; } @@ -1414,7 +1414,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int try{ entityId = MapasCulturais.entity.id; }catch (e){}; const removeSpaceRelationUrl = baseUrl + controllerId + '/' + controllerName + '/' + entityId; - + $http.post(removeSpaceRelationUrl, {id: spaceId}). success(function(data, status){ $scope.data.entity.registrationSpace = undefined; @@ -1439,11 +1439,11 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int let errors = response.data; for (let index in $scope.data.fields){ let field = $scope.data.fields[index]; - + if(field.fieldType == 'file') { field.fieldName = 'file_' + field.id; - } - + } + if(errors[field.fieldName]) { field.error = errors[field.fieldName] } @@ -1457,8 +1457,8 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int .error(function(response) { console.log('error', response); }); - }; - + }; + $scope.data.sent = false; $scope.data.propLabels = []; @@ -1471,7 +1471,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int } $scope.scrollToError = function(){ - + setTimeout(function(){ var $el = $('.invalidField'); window.$el = $el; @@ -1483,7 +1483,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int $scope.sendRegistration = function(redirectUrl = false, isAccountability = false){ var labels = MapasCulturais.gettext.moduleOpportunity; - $timeout.cancel(saveTimeout); + $timeout.cancel(saveTimeout); $scope.saveRegistration().success(function(){ var req = $scope.validateRegistration(); @@ -1491,16 +1491,16 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int req.error(function(){ $scope.scrollToError(); }); - - req.success(function () { + + req.success(function () { // TODO: i18n if(isAccountability){ if(!confirm(labels['providingAccount'])){ return; - } + } } - - + + RegistrationService.send(MapasCulturais.registration.id).success(function(response){ $('.js-response-error').remove(); if(response.error){ @@ -1518,8 +1518,8 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int }else { $el = $('#' + field).find('div:first'); } - - $scope.data.fields.forEach(function(fieldObject) { + + $scope.data.fields.forEach(function(fieldObject) { if(fieldObject.fieldName == field){ fieldObject.error = response.data[field]; } @@ -1530,16 +1530,16 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int }else{ $scope.data.sent = true; MapasCulturais.Messages.success(labels['registrationSent']); - + if (redirectUrl) { document.location = redirectUrl; - } + } else { document.location = response.redirect || response.singleUrl; - } + } } }); - }); + }); }) .error(function(r) { $scope.validateRegistration(); @@ -1574,7 +1574,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int if (current != old) { $scope.saveField(field, current, 10000); } - + }, true); }); @@ -1582,8 +1582,8 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int $('[js-mask]').each(function() { var $this = jQuery(this); - if (!$this.data('js-mask-init')) { - $this.data('js-mask-init', true); + if (!$this.data('js-mask-init')) { + $this.data('js-mask-init', true); } if($(this).hasClass('js-mask-currency')){ @@ -1594,7 +1594,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int }); } setInterval(initMasks, 1000); - + var fieldsByName = {}; @@ -1615,7 +1615,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int var fieldName = $form.parents('.attachment-list-item').data('fieldName'); if(fieldName){ $scope.removeFieldErrors(fieldName); - } + } }); } }; @@ -1656,7 +1656,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int }, 700); }); }; - + $scope.useCategories = MapasCulturais.entity.registrationCategories?.length > 0; $scope.useRegistrationsRanges = MapasCulturais.entity.registrationRanges?.length > 0; @@ -1718,7 +1718,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int if(!field.config?.entityField){ return false; } - + let fname = field.config.entityField.replace('@',''); if (field.config && $scope.lockedEntityField(fname)) { return true; @@ -1728,7 +1728,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int } $scope.showField = function(field){ - + var result = true; if ($scope.useCategories) { @@ -1746,7 +1746,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int result = false; } } - + if(field.conditional){ result = result && $scope.entity[field.conditionalField] == field.conditionalValue; } @@ -1772,15 +1772,15 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int if($scope.data.avaliableEvaluationFields && $scope.data.avaliableEvaluationFields[$scope.getFieldNameString(field)]){ return true; } - + return false; } - + $scope.requiredField = function(field) { if(field.required) { return 1; } - + return false; } @@ -1806,7 +1806,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int } } - $scope.getFieldNameString = function(field) + $scope.getFieldNameString = function(field) { if(field.fieldType == "file"){ return field.groupName; @@ -1820,7 +1820,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int module.controller('EvaluationMethodConfigurationController', ['$scope', '$rootScope', 'RelatedAgentsService', 'EvaluationMethodConfigurationService', 'EditBox', 'OpportunityApiService', function($scope, $rootScope, RelatedAgentsService, EvaluationMethodConfigurationService, EditBox, OpportunityApiService) { var labels = MapasCulturais.gettext.moduleOpportunity; var emconfig = MapasCulturais.entity.object.evaluationMethodConfiguration; - + var committeeApi = new OpportunityApiService($scope, 'committee', 'evaluationCommittee', {'@opportunity': getOpportunityId()}); $scope.editbox = EditBox; @@ -1843,7 +1843,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int categories: MapasCulturais.entity.registrationCategories, committee: [], }; - + committeeApi.find().success(function(result){ $scope.data.committee = result; }); @@ -2027,7 +2027,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int $scope.reopenEvaluations = function(relation){ if(confirm(labels.confirmReopenValuerEvaluations)){ relation.status = 1; - + EvaluationMethodConfigurationService.reopenValuerEvaluations(relation). error(function(){ relation.status = 10; @@ -2107,7 +2107,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int module.factory('OpportunityApiService',['$http', 'UrlService', function($http, UrlService) { var us = new UrlService('api/opportunity'); - + return function($scope, varname, endpoint, params){ var url = us.create(endpoint); var page = 1; @@ -2120,11 +2120,11 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int if(!params['@limit']){ params['@limit'] = 50; } - + this.find = function(){ params['@page'] = page; page++; - + return $http.get(url, {params: params, cache:true}).success(function(response, status, headers){ for (var i in response){ @@ -2136,7 +2136,7 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int } } var metadata = headers()['api-metadata'] ? JSON.parse(headers()['api-metadata']) : {}; - + $scope.data[meta_key] = metadata; if(page > 2) { @@ -2226,7 +2226,7 @@ module.controller('OpportunityController', ['$scope', '$rootScope', '$location', '@select': 'id,singleUrl,category,status,owner.{id,name,singleUrl},consolidatedResult,evaluationResultString,' + select_fields.join(','), '@order': 'consolidatedResult DESC' }; - + for(var prop in $scope.registrationsFilters){ if (prop == 'keyword') { @@ -2263,7 +2263,7 @@ module.controller('OpportunityController', ['$scope', '$rootScope', '$location', $scope.data.findingRegistrations = false; }); } - + $scope.findEvaluations = function(){ if(evaluationsApi.finish()){ return null; @@ -2273,9 +2273,9 @@ module.controller('OpportunityController', ['$scope', '$rootScope', '$location', $scope.data.findingEvaluations = false; }); } - + $scope.$watch('registrationsFilters', do_filter, true); - + $scope.$watch('evaluationsFilters', function(){ var qdata = { '@opportunity': getOpportunityId(), @@ -2288,13 +2288,13 @@ module.controller('OpportunityController', ['$scope', '$rootScope', '$location', } } var valuer_id = jQuery('.js-registration-list').data('valuerId'); - + if(valuer_id) { qdata['valuer:id'] = `EQ(${valuer_id})`; } evaluationsApi = new OpportunityApiService($scope, 'evaluations', 'findEvaluations', qdata); - + $scope.findEvaluations(); }, true); @@ -2307,7 +2307,7 @@ module.controller('OpportunityController', ['$scope', '$rootScope', '$location', }); }); } - + var adjustingBoxPosition = false, categories = MapasCulturais.entity.registrationCategories.length ? MapasCulturais.entity.registrationCategories.map(function(e){ return { value: e, label: e }; @@ -2514,7 +2514,7 @@ module.controller('OpportunityController', ['$scope', '$rootScope', '$location', } $scope.fns = {}; - // MapasCulturais.entity.registrationSpace = { + // MapasCulturais.entity.registrationSpace = { // 'status' : 0, // 'idOpportuniti' : 8}; @@ -2681,12 +2681,12 @@ module.controller('OpportunityController', ['$scope', '$rootScope', '$location', EditBox.close('editbox-select-registration-owner'); RegistrationService.save(); - }; + }; + + $scope.register = function(){ + var registration = $scope.data.registration; - $scope.register = function(){ - var registration = $scope.data.registration; - RegistrationService.register(registration).success(function(rs){ if(rs.error) { if(rs.data.owner) { @@ -2841,7 +2841,7 @@ module.controller('OpportunityController', ['$scope', '$rootScope', '$location', }); } }; - + registrationsApi.find().success(function(){ $scope.registrations = $scope.data.registrations; }); @@ -2870,15 +2870,15 @@ module.controller('OpportunityController', ['$scope', '$rootScope', '$location', '@keyword' : 'like('+$scope.data.keywords+')' }; - + if($scope.data.pending){ args['@pending'] = true; } - + MapasCulturais.cookies.set('pending',$scope.data.pending) var registrationAndEvaluationsApi = new OpportunityApiService($scope, 'registrationAndEvaluations', 'findRegistrationsAndEvaluations', args); - + registrationAndEvaluationsApi.find().success(function(){ $scope.registrationAndEvaluations = $scope.data.registrationAndEvaluations.map(object => { return { @@ -2890,11 +2890,11 @@ module.controller('OpportunityController', ['$scope', '$rootScope', '$location', resultString: object.resultString } }) - }); + }); }, 1500); }); - + $scope.evaluated = function(registration){ return evaluations[registration.id] && evaluations[registration.id].result !== null; }; @@ -2928,7 +2928,7 @@ module.controller('OpportunityController', ['$scope', '$rootScope', '$location', if(MapasCulturais.evaluationStatus[type]?.valid.includes(result)){ return "valid"; } - + return "finish"; }; @@ -3098,7 +3098,7 @@ module.controller('SealsController', ['$scope', '$rootScope', 'RelatedSealsServi find: function (data) { var qdata = '?@select=id,name,shortDescription,type,status,terms,registrationFrom,registrationTo,owner.{id,name,singleUrl}&@files=(avatar.avatarMedium):url&opportunity=EQ(' + MapasCulturais.entity.id + ')&@order=createTimestamp DESC&@offset=' + data.offset + '&@limit=' + data.limit + ''; - + return $http.get(MapasCulturais.createUrl('api/project', 'find') + qdata). success(function (data, status, headers) { for (var i = 0; i < data.length; i++) { @@ -3114,7 +3114,7 @@ module.controller('SealsController', ['$scope', '$rootScope', 'RelatedSealsServi }); } }; - + }]); })(angular); diff --git a/api/mapas/src/themes/BaseV2/assets-src/sass/2.components/_mc-loading.scss b/api/mapas/src/themes/BaseV2/assets-src/sass/2.components/_mc-loading.scss index e7dcfed8d2..ee85c08bfb 100644 --- a/api/mapas/src/themes/BaseV2/assets-src/sass/2.components/_mc-loading.scss +++ b/api/mapas/src/themes/BaseV2/assets-src/sass/2.components/_mc-loading.scss @@ -9,9 +9,15 @@ line-height: size(25); margin: 0 auto; justify-content: center; - + color: var(--mc-white); + .iconify { font-size: size(40); + color: var(--mc-white); + } + + text { + color: var(--mc-white); } } diff --git a/api/mapas/src/translations/pt-br.php b/api/mapas/src/translations/pt-br.php index d52aba87a0..dd8f722323 100644 --- a/api/mapas/src/translations/pt-br.php +++ b/api/mapas/src/translations/pt-br.php @@ -55,7 +55,7 @@ "Required" => 'Obrigatório', "Facultative" => 'Facultativo', "Don't use" => 'Não usar', - + // registration field types 'Check Boxes Field' => 'Seleção múltipla (checkboxes)', 'Radio Buttons Field' => 'Seleção única (radio)', @@ -65,5 +65,5 @@ 'Text Field' => 'Campo de texto simples', 'Textarea Field' => 'Campo de texto (textarea)', 'Date Field' => 'Campo de data', - + );