Skip to content

Commit 8bcf6f4

Browse files
authored
Merge pull request #313 from secultce/feature/birthDate
Feature/birth date
2 parents d1ba064 + 8cf9d18 commit 8bcf6f4

File tree

5 files changed

+15
-26
lines changed

5 files changed

+15
-26
lines changed

compose/local/config.d/auth.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22

33
return [
4-
// 'auth.provider' => 'Fake',
5-
'auth.provider' => '\MultipleLocalAuth\Provider',
4+
'auth.provider' => 'Fake',
5+
// 'auth.provider' => '\MultipleLocalAuth\Provider',
66
'auth.config' => [
77
'salt' => 'LT_SECURITY_SALT_SECURITY_SALT_SECURITY_SALT_SECURITY_SALT_SECU',
88
'timeout' => '24 hours',

src/protected/application/lib/modules/RegistrationFieldTypes/layouts/parts/registration-field-types/agent-collective-field-config.php

+4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
} else {
2222
$fields_options[$field] = $field;
2323
}
24+
// Removendo opção de adicionar a data de nascimento ou fundação
25+
if($field == 'dataDeNascimento') {
26+
unset($fields_options[$field]);
27+
}
2428
}
2529
?>
2630
<div ng-if="field.fieldType === 'agent-collective-field'" >

src/protected/application/lib/modules/RegistrationFieldTypes/layouts/parts/registration-field-types/agent-owner-field-config.php

+4
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@
3737
} else {
3838
$fields_options[$field] = $field;
3939
}
40+
// Removendo opção de adicionar a data de nascimento
41+
if($field == 'dataDeNascimento') {
42+
unset($fields_options[$field]);
43+
}
4044
}
4145
// eval(\psy\sh());
4246
?>

src/protected/application/themes/BaseV1/assets/js/ng.entity.module.opportunity.js

+4-23
Original file line numberDiff line numberDiff line change
@@ -2104,7 +2104,10 @@ module.controller('RegistrationFieldsController', ['$scope', '$rootScope', '$int
21042104
}
21052105
}]);
21062106

2107-
module.controller('OpportunityController', ['$scope', '$rootScope', '$location', '$anchorScroll', '$timeout', 'RegistrationService', 'EditBox', 'RelatedAgentsService', '$http', 'UrlService', 'OpportunityApiService', '$window', function ($scope, $rootScope, $location, $anchorScroll, $timeout, RegistrationService, EditBox, RelatedAgentsService, $http, UrlService, OpportunityApiService, $window) {
2107+
module.controller('OpportunityController', ['$scope', '$rootScope', '$location', '$anchorScroll', '$timeout',
2108+
'RegistrationService', 'EditBox', 'RelatedAgentsService', '$http', 'UrlService', 'OpportunityApiService', '$window',
2109+
function ($scope, $rootScope, $location, $anchorScroll, $timeout, RegistrationService, EditBox, RelatedAgentsService,
2110+
$http, UrlService, OpportunityApiService, $window) {
21082111
var labels = MapasCulturais.gettext.moduleOpportunity;
21092112

21102113
var opportunity_main_tab = $("#opportunity-main-info");
@@ -2245,28 +2248,6 @@ module.controller('OpportunityController', ['$scope', '$rootScope', '$location',
22452248
});
22462249
}
22472250

2248-
angular.element($window).bind("scroll", function(){
2249-
// @TODO: refatorar este if
2250-
if(document.location.hash.indexOf("tab=inscritos") >= 0){
2251-
if(!$scope.data.findingRegistrations){
2252-
if(document.body.offsetHeight - $window.pageYOffset < $window.innerHeight){
2253-
$scope.findRegistrations();
2254-
}
2255-
}
2256-
} else if (document.location.hash.indexOf("tab=evaluations") >= 0){
2257-
if(!$scope.data.findingEvaluations){
2258-
if(document.body.offsetHeight - $window.pageYOffset < $window.innerHeight){
2259-
$scope.findEvaluations();
2260-
}
2261-
}
2262-
} else if(document.location.hash.indexOf("tab=support") >= 0){
2263-
if(!$scope.data.findingRegistrations){
2264-
if(document.body.offsetHeight - $window.pageYOffset < $window.innerHeight){
2265-
$scope.findRegistrations();
2266-
}
2267-
}
2268-
}
2269-
});
22702251

22712252
var adjustingBoxPosition = false,
22722253
categories = MapasCulturais.entity.registrationCategories.length ? MapasCulturais.entity.registrationCategories.map(function(e){

version.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.9.4-rc1
1+
5.9.4-rc2

0 commit comments

Comments
 (0)