diff --git a/Plugin.php b/Plugin.php index a1e0afc..d5d4149 100644 --- a/Plugin.php +++ b/Plugin.php @@ -9,11 +9,18 @@ class Plugin extends \MapasCulturais\Plugin { public function _init () { $app = App::i(); - $app->hook('view.partial(singles/opportunity-evaluations--committee):after', function($template){ - $data = []; + $app->hook('view.render(<<*>>):before', function () use ($app) { $this->enqueueScript('app', 'editRegistration', 'js/editRegistration.js'); - $this->part('singles/edit-registration-opportunity-evaluations', ['template' => $template]); + $this->enqueueScript('app', 'remodal', 'js/remodal.min.js'); + $app->view->enqueueStyle('app', 'editRegistration', 'css/edtRegistrationStyle.css'); + $this->enqueueStyle('app', 'remodal', 'css/remodal/remodal.min.css'); + $this->enqueueStyle('app', 'remodal-theme', 'css/remodal/remodal-default-theme.min.css'); }); + + // $app->hook('view.partial(singles/opportunity-evaluations--committee):after', function($template){ + // $data = []; + + // }); $app->hook('view.partial(singles/registration-single--header):after', function($template, $app){ @@ -25,7 +32,8 @@ public function _init () { $this->part('singles/edit-registration-single--header', ['entity' => $entity, 'opportunity' => $opportunity, 'id' => $id]); }); - $app->hook('POST(registration.alterStatusRegistration)', function () use ($app) { + $app->hook('POST(registration.alterStatusRegistration)', function () use ($app) + { try { // $this->requireAuthentication(); @@ -42,19 +50,32 @@ public function _init () { // ADICIONANDO MODAL DE CAMPOS OBRIGATÓRIOS $app->hook('view.partial(singles/registration-edit--fields):after', function() use($app){ $this->part('modals/info-field--required'); + + }); + //NA PÁGINA DA CRIAÇÃO DA OPORTUNIDADE + $app->hook('template(opportunity.edit.registration-config):after', function() use($app){ + $this->enqueueScript('app', 'editRegistration', 'js/editRegistration.js'); + $this->part('singles/edit-registration-opportunity-evaluations'); + }); + + $app->hook(' template(registration.view.form):end', function() use($app){ + $this->part('singles/edit-registration-message--send'); }); - $app->hook('template(registration.view.pdf-report-btn):before', function() use($app){ + + $app->hook('template(registration.view.header-fieldset):before', function() use($app){ $day = new DateTime('now'); $cantEdit = false; - + //A entidade é a inscrição + $entity = $this->data['entity']; /** CASO A DATA DE HOJE FOR MENOR OU IGUAL A DATA DO FIM DA INSCRIÇÃO */ - if($this->data['entity']->opportunity->select_edit_registration == '1' && ($day <= $this->data['entity']->opportunity->registrationTo)) { + if($this->data['entity']->opportunity->select_edit_registration == '1' && + ($day <= $this->data['entity']->opportunity->registrationTo)) { $cantEdit = true; } if($cantEdit) - $this->part('singles/edit-registration-button-edition'); + $this->part('singles/edit-registration-button-edition',['entity' => $entity]); }); /** diff --git a/assets/css/edtRegistrationStyle.css b/assets/css/edtRegistrationStyle.css index 20c67a2..2a58816 100644 --- a/assets/css/edtRegistrationStyle.css +++ b/assets/css/edtRegistrationStyle.css @@ -51,11 +51,13 @@ .btn-registration { background-color: #20873B !important; border: 1px solid #20873B !important; + margin-bottom: 5px; } .btn-registration:hover { - background-color: #20873B ; + background-color: #07a330 !important; border: 1px solid #20873B !important; + margin: 5px; } .registration-header-check > a { @@ -114,4 +116,7 @@ background: #8C9EFF; flex-direction: row; align-items: center; +} +.registration-help-edit-registration { + margin-left: 15px; } \ No newline at end of file diff --git a/assets/css/remodal/remodal-default-theme.min.css b/assets/css/remodal/remodal-default-theme.min.css new file mode 100644 index 0000000..39d0518 --- /dev/null +++ b/assets/css/remodal/remodal-default-theme.min.css @@ -0,0 +1 @@ +.remodal-bg.remodal-is-opened,.remodal-bg.remodal-is-opening{-webkit-filter:blur(3px);filter:blur(3px)}.remodal-overlay{background:rgba(43,46,56,.9)}.remodal-overlay.remodal-is-closing,.remodal-overlay.remodal-is-opening{-webkit-animation-duration:.3s;animation-duration:.3s;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards}.remodal-overlay.remodal-is-opening{-webkit-animation-name:remodal-overlay-opening-keyframes;animation-name:remodal-overlay-opening-keyframes}.remodal-overlay.remodal-is-closing{-webkit-animation-name:remodal-overlay-closing-keyframes;animation-name:remodal-overlay-closing-keyframes}.remodal-wrapper{padding:10px 10px 0}.remodal{box-sizing:border-box;width:100%;margin-bottom:10px;padding:35px;-webkit-transform:translate3d(0,0,0);transform:translate3d(0,0,0);color:#2b2e38;background:#fff}.remodal-close,.remodal-close:before{position:absolute;top:0;left:0;display:block;width:35px}.remodal-cancel,.remodal-close,.remodal-confirm{overflow:visible;margin:0;cursor:pointer;text-decoration:none;outline:0;border:0}.remodal.remodal-is-closing,.remodal.remodal-is-opening{-webkit-animation-duration:.3s;animation-duration:.3s;-webkit-animation-fill-mode:forwards;animation-fill-mode:forwards}.remodal.remodal-is-opening{-webkit-animation-name:remodal-opening-keyframes;animation-name:remodal-opening-keyframes}.remodal.remodal-is-closing{-webkit-animation-name:remodal-closing-keyframes;animation-name:remodal-closing-keyframes}.remodal,.remodal-wrapper:after{vertical-align:middle}.remodal-close{height:35px;padding:0;-webkit-transition:color .2s;transition:color .2s;color:#95979c;background:0 0}.remodal-close:focus,.remodal-close:hover{color:#2b2e38}.remodal-close:before{font-family:Arial,"Helvetica CY","Nimbus Sans L",sans-serif!important;font-size:25px;line-height:35px;content:"\00d7";text-align:center}.remodal-cancel,.remodal-confirm{font:inherit;display:inline-block;min-width:110px;padding:12px 0;-webkit-transition:background .2s;transition:background .2s;text-align:center;vertical-align:middle}.remodal-confirm{color:#fff;background:#81c784}.remodal-confirm:focus,.remodal-confirm:hover{background:#66bb6a}.remodal-cancel{color:#fff;background:#e57373}.remodal-cancel:focus,.remodal-cancel:hover{background:#ef5350}.remodal-cancel::-moz-focus-inner,.remodal-close::-moz-focus-inner,.remodal-confirm::-moz-focus-inner{padding:0;border:0}@-webkit-keyframes remodal-opening-keyframes{from{-webkit-transform:scale(1.05);transform:scale(1.05);opacity:0}to{-webkit-transform:none;transform:none;opacity:1;-webkit-filter:blur(0);filter:blur(0)}}@keyframes remodal-opening-keyframes{from{-webkit-transform:scale(1.05);transform:scale(1.05);opacity:0}to{-webkit-transform:none;transform:none;opacity:1;-webkit-filter:blur(0);filter:blur(0)}}@-webkit-keyframes remodal-closing-keyframes{from{-webkit-transform:scale(1);transform:scale(1);opacity:1}to{-webkit-transform:scale(.95);transform:scale(.95);opacity:0;-webkit-filter:blur(0);filter:blur(0)}}@keyframes remodal-closing-keyframes{from{-webkit-transform:scale(1);transform:scale(1);opacity:1}to{-webkit-transform:scale(.95);transform:scale(.95);opacity:0;-webkit-filter:blur(0);filter:blur(0)}}@-webkit-keyframes remodal-overlay-opening-keyframes{from{opacity:0}to{opacity:1}}@keyframes remodal-overlay-opening-keyframes{from{opacity:0}to{opacity:1}}@-webkit-keyframes remodal-overlay-closing-keyframes{from{opacity:1}to{opacity:0}}@keyframes remodal-overlay-closing-keyframes{from{opacity:1}to{opacity:0}}@media only screen and (min-width:641px){.remodal{max-width:700px}}.lt-ie9 .remodal-overlay{background:#2b2e38}.lt-ie9 .remodal{width:700px}/*# sourceMappingURL=remodal-default-theme.min.css.map */ \ No newline at end of file diff --git a/assets/css/remodal/remodal.min.css b/assets/css/remodal/remodal.min.css new file mode 100644 index 0000000..2b9d8e6 --- /dev/null +++ b/assets/css/remodal/remodal.min.css @@ -0,0 +1 @@ +html.remodal-is-locked{overflow:hidden;-ms-touch-action:none;touch-action:none}.remodal,[data-remodal-id]{display:none}.remodal-overlay{position:fixed;z-index:9999;top:-5000px;right:-5000px;bottom:-5000px;left:-5000px;display:none}.remodal-wrapper{position:fixed;z-index:10000;top:0;right:0;bottom:0;left:0;display:none;overflow:auto;text-align:center;-webkit-overflow-scrolling:touch}.remodal-wrapper:after{display:inline-block;height:100%;margin-left:-.05em;content:""}.remodal-overlay,.remodal-wrapper{-webkit-backface-visibility:hidden;backface-visibility:hidden}.remodal{position:relative;outline:0;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;text-size-adjust:100%}.remodal-is-initialized{display:inline-block}/*# sourceMappingURL=remodal.min.css.map */ \ No newline at end of file diff --git a/assets/js/editRegistration.js b/assets/js/editRegistration.js index bef8593..137c7a1 100644 --- a/assets/js/editRegistration.js +++ b/assets/js/editRegistration.js @@ -18,6 +18,38 @@ $(document).ready(function () { $(".agentes-relacionados .registration-fieldset > span").show(); } } - $("#select_edit_registrations").editable('setValue', select); + $("#select_edit_registration").editable('setValue', select); } -}); \ No newline at end of file + // var dataPostSendAudit = { + // "user_id": 25414, + // "object_id": "55544111", + // "object_type": "Registratrion", + // "action": "Criou", + // "message": "Criou um registro", + // "key": "field_4455", + // "value": "Adionando valores" + // } + // jQuery.ajax({ + // url:'http://localhost:5000/audit', + // type: "OPTIONS", + // data: dataPostSendAudit, + // dataType: "text", + // contentType: "text/plain; charset=utf-8", + // success: function(res){ + // console.log({res}) + // }, + // error: function(err){ + // console.log({err}) + // } + + // }) + // .done(function() { + // console.log( "second success" ); + // }) + // .fail(function() { + // console.log( "error" ); + // }) + // .always(function() { + // console.log( "finished" ); + // }); +}); diff --git a/assets/js/remodal.min.js b/assets/js/remodal.min.js new file mode 100644 index 0000000..cffd08e --- /dev/null +++ b/assets/js/remodal.min.js @@ -0,0 +1,10 @@ +/* + * Remodal - v1.1.1 + * Responsive, lightweight, fast, synchronized with CSS animations, fully customizable modal window plugin with declarative configuration and hash tracking. + * http://vodkabears.github.io/remodal/ + * + * Made by Ilya Makarov + * Under MIT License + */ + +!function(a,b){"function"==typeof define&&define.amd?define(["jquery"],function(c){return b(a,c)}):"object"==typeof exports?b(a,require("jquery")):b(a,a.jQuery||a.Zepto)}(this,function(a,b){"use strict";function c(a){if(w&&"none"===a.css("animation-name")&&"none"===a.css("-webkit-animation-name")&&"none"===a.css("-moz-animation-name")&&"none"===a.css("-o-animation-name")&&"none"===a.css("-ms-animation-name"))return 0;var b,c,d,e,f=a.css("animation-duration")||a.css("-webkit-animation-duration")||a.css("-moz-animation-duration")||a.css("-o-animation-duration")||a.css("-ms-animation-duration")||"0s",g=a.css("animation-delay")||a.css("-webkit-animation-delay")||a.css("-moz-animation-delay")||a.css("-o-animation-delay")||a.css("-ms-animation-delay")||"0s",h=a.css("animation-iteration-count")||a.css("-webkit-animation-iteration-count")||a.css("-moz-animation-iteration-count")||a.css("-o-animation-iteration-count")||a.css("-ms-animation-iteration-count")||"1";for(f=f.split(", "),g=g.split(", "),h=h.split(", "),e=0,c=f.length,b=Number.NEGATIVE_INFINITY;eb&&(b=d);return b}function d(){if(b(document).height()<=b(window).height())return 0;var a,c,d=document.createElement("div"),e=document.createElement("div");return d.style.visibility="hidden",d.style.width="100px",document.body.appendChild(d),a=d.offsetWidth,d.style.overflow="scroll",e.style.width="100%",d.appendChild(e),c=e.offsetWidth,d.parentNode.removeChild(d),a-c}function e(){if(!x){var a,c,e=b("html"),f=k("is-locked");e.hasClass(f)||(c=b(document.body),a=parseInt(c.css("padding-right"),10)+d(),c.css("padding-right",a+"px"),e.addClass(f))}}function f(){if(!x){var a,c,e=b("html"),f=k("is-locked");e.hasClass(f)&&(c=b(document.body),a=parseInt(c.css("padding-right"),10)-d(),c.css("padding-right",a+"px"),e.removeClass(f))}}function g(a,b,c,d){var e=k("is",b),f=[k("is",u.CLOSING),k("is",u.OPENING),k("is",u.CLOSED),k("is",u.OPENED)].join(" ");a.$bg.removeClass(f).addClass(e),a.$overlay.removeClass(f).addClass(e),a.$wrapper.removeClass(f).addClass(e),a.$modal.removeClass(f).addClass(e),a.state=b,!c&&a.$modal.trigger({type:b,reason:d},[{reason:d}])}function h(a,d,e){var f=0,g=function(a){a.target===this&&f++},h=function(a){a.target===this&&0===--f&&(b.each(["$bg","$overlay","$wrapper","$modal"],function(a,b){e[b].off(r+" "+s)}),d())};b.each(["$bg","$overlay","$wrapper","$modal"],function(a,b){e[b].on(r,g).on(s,h)}),a(),0===c(e.$bg)&&0===c(e.$overlay)&&0===c(e.$wrapper)&&0===c(e.$modal)&&(b.each(["$bg","$overlay","$wrapper","$modal"],function(a,b){e[b].off(r+" "+s)}),d())}function i(a){a.state!==u.CLOSED&&(b.each(["$bg","$overlay","$wrapper","$modal"],function(b,c){a[c].off(r+" "+s)}),a.$bg.removeClass(a.settings.modifier),a.$overlay.removeClass(a.settings.modifier).hide(),a.$wrapper.hide(),f(),g(a,u.CLOSED,!0))}function j(a){var b,c,d,e,f={};for(a=a.replace(/\s*:\s*/g,":").replace(/\s*,\s*/g,","),b=a.split(","),e=0,c=b.length;e").addClass(k("overlay")+" "+k("is",u.CLOSED)).hide(),e.append(f.$overlay)),f.$bg=b("."+k("bg")).addClass(k("is",u.CLOSED)),f.$modal=a.addClass(q+" "+k("is-initialized")+" "+f.settings.modifier+" "+k("is",u.CLOSED)).attr("tabindex","-1"),f.$wrapper=b("
").addClass(k("wrapper")+" "+f.settings.modifier+" "+k("is",u.CLOSED)).hide().append(f.$modal),e.append(f.$wrapper),f.$wrapper.on("click."+q,'[data-remodal-action="close"]',function(a){a.preventDefault(),f.close()}),f.$wrapper.on("click."+q,'[data-remodal-action="cancel"]',function(a){a.preventDefault(),f.$modal.trigger(v.CANCELLATION),f.settings.closeOnCancel&&f.close(v.CANCELLATION)}),f.$wrapper.on("click."+q,'[data-remodal-action="confirm"]',function(a){a.preventDefault(),f.$modal.trigger(v.CONFIRMATION),f.settings.closeOnConfirm&&f.close(v.CONFIRMATION)}),f.$wrapper.on("click."+q,function(a){var c=b(a.target);c.hasClass(k("wrapper"))&&f.settings.closeOnOutsideClick&&f.close()})}var n,o,p="remodal",q=a.REMODAL_GLOBALS&&a.REMODAL_GLOBALS.NAMESPACE||p,r=b.map(["animationstart","webkitAnimationStart","MSAnimationStart","oAnimationStart"],function(a){return a+"."+q}).join(" "),s=b.map(["animationend","webkitAnimationEnd","MSAnimationEnd","oAnimationEnd"],function(a){return a+"."+q}).join(" "),t=b.extend({hashTracking:!0,closeOnConfirm:!0,closeOnCancel:!0,closeOnEscape:!0,closeOnOutsideClick:!0,modifier:"",appendTo:null},a.REMODAL_GLOBALS&&a.REMODAL_GLOBALS.DEFAULTS),u={CLOSING:"closing",CLOSED:"closed",OPENING:"opening",OPENED:"opened"},v={CONFIRMATION:"confirmation",CANCELLATION:"cancellation"},w=function(){var a=document.createElement("div").style;return void 0!==a.animationName||void 0!==a.WebkitAnimationName||void 0!==a.MozAnimationName||void 0!==a.msAnimationName||void 0!==a.OAnimationName}(),x=/iPad|iPhone|iPod/.test(navigator.platform);m.prototype.open=function(){var a,c=this;c.state!==u.OPENING&&c.state!==u.CLOSING&&(a=c.$modal.attr("data-remodal-id"),a&&c.settings.hashTracking&&(o=b(window).scrollTop(),location.hash=a),n&&n!==c&&i(n),n=c,e(),c.$bg.addClass(c.settings.modifier),c.$overlay.addClass(c.settings.modifier).show(),c.$wrapper.show().scrollTop(0),c.$modal.focus(),h(function(){g(c,u.OPENING)},function(){g(c,u.OPENED)},c))},m.prototype.close=function(a){var c=this;c.state!==u.OPENING&&c.state!==u.CLOSING&&c.state!==u.CLOSED&&(c.settings.hashTracking&&c.$modal.attr("data-remodal-id")===location.hash.substr(1)&&(location.hash="",b(window).scrollTop(o)),h(function(){g(c,u.CLOSING,!1,a)},function(){c.$bg.removeClass(c.settings.modifier),c.$overlay.removeClass(c.settings.modifier).hide(),c.$wrapper.hide(),f(),g(c,u.CLOSED,!1,a)},c))},m.prototype.getState=function(){return this.state},m.prototype.destroy=function(){var a,c=b[p].lookup;i(this),this.$wrapper.remove(),delete c[this.index],a=b.grep(c,function(a){return!!a}).length,0===a&&(this.$overlay.remove(),this.$bg.removeClass(k("is",u.CLOSING)+" "+k("is",u.OPENING)+" "+k("is",u.CLOSED)+" "+k("is",u.OPENED)))},b[p]={lookup:[]},b.fn[p]=function(a){var c,d;return this.each(function(e,f){d=b(f),null==d.data(p)?(c=new m(d,a),d.data(p,c.index),c.settings.hashTracking&&d.attr("data-remodal-id")===location.hash.substr(1)&&c.open()):c=b[p].lookup[d.data(p)]}),c},b(document).ready(function(){b(document).on("click","[data-remodal-target]",function(a){a.preventDefault();var c=a.currentTarget,d=c.getAttribute("data-remodal-target"),e=b('[data-remodal-id="'+d+'"]');b[p].lookup[e.data(p)].open()}),b(document).find("."+q).each(function(a,c){var d=b(c),e=d.data("remodal-options");e?("string"==typeof e||e instanceof String)&&(e=j(e)):e={},d[p](e)}),b(document).on("keydown."+q,function(a){n&&n.settings.closeOnEscape&&n.state===u.OPENED&&27===a.keyCode&&n.close()}),b(window).on("hashchange."+q,l)})}); \ No newline at end of file diff --git a/layouts/parts/singles/edit-registration-button-edition.php b/layouts/parts/singles/edit-registration-button-edition.php index c6bbef4..4a9ddff 100644 --- a/layouts/parts/singles/edit-registration-button-edition.php +++ b/layouts/parts/singles/edit-registration-button-edition.php @@ -1,3 +1,14 @@ +canUser('@control')): +?> + - \ No newline at end of file + + + \ No newline at end of file diff --git a/layouts/parts/singles/edit-registration-message--send.php b/layouts/parts/singles/edit-registration-message--send.php new file mode 100644 index 0000000..9cc0326 --- /dev/null +++ b/layouts/parts/singles/edit-registration-message--send.php @@ -0,0 +1,15 @@ + + +
+

+ + + + +

+
\ No newline at end of file diff --git a/layouts/parts/singles/edit-registration-opportunity-evaluations.php b/layouts/parts/singles/edit-registration-opportunity-evaluations.php index ff3e0e8..8426e5c 100644 --- a/layouts/parts/singles/edit-registration-opportunity-evaluations.php +++ b/layouts/parts/singles/edit-registration-opportunity-evaluations.php @@ -12,7 +12,14 @@ $this->jsObject['limitDate'] = TRUE; ?>
- + applyTemplateHook('edit-registration-enabled','begin'); ?> + +

+ + +

@@ -21,14 +28,15 @@ -