npm - @cronapp/templates - Versions diffs - 2.9.2 → 2.9.3-SP.2 - Mend

@cronapp/templates 2.9.2 → 2.9.3-SP.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (34) hide show

package/file/crud/angular_view_update/__FileName__.view.html.ftl ADDED Viewed

@@ -0,0 +1,332 @@
+<div id="starter" ng-init="" ng-destroy="" data-component="crn-start" screen-params="" primary-datasource="${model.dataSourceName}">
+<h1 class="component-holder text-left h3 title" xattr-position="text-left" xattr-type="h3" data-component="crn-text-component" id="crn-text-component-${model.random}">
+<#if model.realName ?has_content >${model.realName}<#else>${model.dataSourceName}</#if>
+</h1>
+<datasource data-component="crn-datasource" filter="" name="${model.dataSourceName}" entity="${model.dataSourceFullName}" keys="${model.dataSourcePrimaryKeys}" rows-per-page="100" class="" schema="${model.getDSSchema(model.dataSourceName)}" condition="${model.getDSCondition(model.dataSourceName)}" lazy="false"></datasource>
+<div data-component="crn-form" id="crn-form-form-${model.dataSourceName}-${model.random}">
+    <section >
+        <form crn-datasource="${model.dataSourceName}" class="">
+            <div class="">
+                <div class="component-holder ng-scope text-right" data-component="crn-button" id="btn_crud_post_${model.random}">
+                    <button class="btn k-button btn-block btn-success btn-fab" ng-click="datasource.post()" aria-label="{{'SaveChanges' | translate}}" xattr-fullsize="btn-block" xattr-theme="btn-success" xattr-disabled="">
+                        <i class="glyphicon glyphicon-ok" icon-theme=""></i>
+                    </button>
+                </div>
+            </div>
+            <br/>
+            <div class="crn-fieldset">
+                <#list model.formFields as field>
+                    <#assign currentType = "textinput">
+                    <#if field.getProperty("ngOptions")??>
+                        <#assign currentType = "enterprise-dynamic-combobox">
+                        <datasource data-component="crn-datasource" name="${field.name!?cap_first}Combo" entity="${model.namespace}.${field.type}" keys="${model.getDataSourcePrimaryKeys(field)}" schema="${model.getDSSchema(field.type)}" lazy=true></datasource>
+                    </#if>
+                    <#assign dataComponentType = "crn-${currentType}">
+                    <#if field.isImage()>
+                        <#assign dataComponentType = "crn-dynamic-image">
+                    <#elseif field.isFile()>
+                        <#assign dataComponentType = "crn-dynamic-file">
+                    <#elseif (field.isBoolean()) >
+                        <#assign dataComponentType = "crn-enterprise-checkbox">
+                    </#if>
+                    <div data-component="${dataComponentType}" id="crn-${currentType}-${field.name}-${model.random}" class="">
+                        <div class="form-group">
+                            <#if !field.isBoolean()>
+                                <#if field.isImage() || field.isFile()>
+                                <label for="${currentType}-${field.name}-button" class="">${model.formMapLabels[field.name]!?cap_first}</label>
+                                <#else>
+                                <label for="${currentType}-${field.name}" class="">${model.formMapLabels[field.name]!?cap_first}</label>
+                                </#if>
+                            </#if>
+                            <#if field.getProperty("ngOptions")?? >
+                                <#assign dataSourceName = "${field.name!?cap_first}Combo">
+                                <cron-dynamic-select
+                                        <#if !field.isNullable()>required="required"</#if>
+                                        id="${currentType}-${field.name}"
+                                        name="${currentType}-${field.name}"
+                                        options="${model.getComboOptions(field.type, field.getProperty("ngOptionsFkName"), field.getProperty("ngOptions").keys, dataSourceName)}"
+                                        ng-model="${model.dataSourceName}.active.${field.name}"
+                                        class="crn-select form-control">
+                                </cron-dynamic-select>
+                            <#elseif field.isBoolean() >
+                                <input type="checkbox" <#if field.isNullable()>crn-allow-null-values="true"<#else>crn-allow-null-values="false"</#if> class="k-checkbox" ng-model="${model.dataSourceName}.active.${field.name}" id="${currentType}-${field.name}" placeholder="<#if field.label?has_content>${field.label}<#else>${field.name}</#if>" <#if !field.isNullable()>required="required"</#if>>
+                                <label for="${currentType}-${field.name}" class="k-checkbox-label">${model.formMapLabels[field.name]!?cap_first}</label>
+                            <#elseif field.isImage()>
+                                <div dynamic-image img-alt-text="${model.formMapLabels[field.name]!?cap_first}" id="${currentType}-${field.name}" ng-model="${model.dataSourceName}.active.${field.name}" max-file-size="5MB" class="dynamic-image-container" <#if !field.isNullable()>ng-required="true"<#else>ng-required="false"</#if>>
+                                    {{"template.crud.clickOrDragAnImage" | translate}}
+                                </div>
+                            <#elseif field.isFile()>
+                                <div dynamic-file id="${currentType}-${field.name}" ng-model="${model.dataSourceName}.active.${field.name}" max-file-size="5MB" class="dynamic-image-container" <#if !field.isNullable()>ng-required="true"<#else>ng-required="false"</#if>>
+                                    {{"template.crud.clickOrDragAnFile" | translate}}
+                                </div>
+                            <#else>
+                                <input
+                                        <#if field.getLength()??>
+                                            maxlength="${field.getLength()?string["0"]}"
+                                        </#if>
+                                        type="<#if field.isEncryption()>password<#else>${field.getHtmlType()}</#if>"
+                                        ng-model="${model.dataSourceName}.active.${field.name}"
+                                        class="form-control k-textbox"
+                                        id="${currentType}-${field.name}"
+                                        placeholder="<#if field.label?has_content>${field.label}<#else>${field.name}</#if>"
+                                        mask="${model.formMapMasks[field.name]}"
+                                        mask-placeholder=""
+                                        <#assign valid = "" >
+                                        <#if model.formMapMasks[field.name] == "999.999.999-99;0" >
+                                            <#assign valid = "cpf" >
+                                        <#elseif model.formMapMasks[field.name] == "99.999.999/9999-99;0">
+                                            <#assign valid = "cnpj" >
+                                        </#if>
+                                        <#if valid?has_content>
+                                            valid="${valid}"
+                                            data-error-message="{{'invalid.${valid}' | translate}}"
+                                        </#if>
+                                        <#if !field.isNullable()>ng-required="true"<#else>ng-required="false"</#if>>
+                            </#if>
+                        </div>
+                    </div>
+                </#list>
+                <!-- NtoN  -->
+                <#list model.formFieldsNToN as field>
+                    <#assign relationClassName = "">
+                    <#assign dataSourceName = "">
+                    <#assign keysDs = "">
+                    <#if model.getManyToManyRelationship(field.getName())?? && model.getManyToManyRelationship(field.getName()).getRelationClassField().getClazz()??>
+                        <#assign relationClassName = "${model.getManyToManyRelationship(field.getName()).getRelationClassField().getClazz()}">
+                        <#if model.getManyToManyRelationship(field.getName()).getRelationClassField().getClazz().getAdjustedFullPrimaryKeys()??>
+                            <#assign keysDs = "${model.getJoinKeys(model.getManyToManyRelationship(field.getName()).getRelationClassField().getClazz().getAdjustedFullPrimaryKeys())}">
+                        </#if>
+                    </#if>
+                    <datasource
+                            data-component="crn-datasource"
+                            name="${relationClassName}"
+                            entity="${model.namespace}.${relationClassName}"
+                            keys="${keysDs}"
+                            dependent-lazy-post="${model.dataSourceName}"
+                            rows-per-page="100"
+                            parameters="${model.getParametersDataSource(field)}"
+                            schema="${model.getDSSchema(relationClassName)}"
+                            lazy=true
+                    >
+                    </datasource>
+                    <#if !field.getProperty("NToNOption")?has_content || field.getProperty("NToNOption") == "Lista">
+                        <datasource data-component="crn-datasource" name="${field.getName()}NCombo" entity="${model.namespace}.${field.getRelationClazz().getName()}" keys="${model.getJoinKeys(field.getRelationClazz().getAdjustedFullPrimaryKeys())}" schema="${model.getDSSchema(field.getName())}" ></datasource>
+                        <div class="component-holder ng-binding ng-scope " data-component="crn-enterprise-combobox-multiple" >
+                            <div class="form-group">
+                                <label for="combobox${field.getName()}-container">${field.getName()?cap_first}</label>
+                                <cron-multi-select
+                                        options="${model.getMultiSelectOptions(field)}"
+                                        ng-required="false"
+                                        id="combobox${field.getName()}"
+                                        name="combobox${field.getName()}"
+                                        ng-model="${relationClassName}.data"
+                                        class="crn-select form-control" style="">
+                                </cron-multi-select>
+                            </div>
+                        </div>
+                    <#else>
+                        <h2 class="lead component-holder text-left" data-component="crn-subtitle" xattr-position="text-left" id="crud-title-${model.random}" >${field.getName()?cap_first}</h2>
+                        <div class="component-holder ng-binding ng-scope" data-component="crn-cron-grid" id="crn-grid-${field.getName()}-${model.random}">
+                            <#assign dataSourceName = "${relationClassName}">
+                            <cron-grid options="${model.getGridOptions(relationClassName, dataSourceName, field)}" ng-model="vars.grid${field.getName()}${model.random}" class="" style=""></cron-grid>
+                        </div>
+                    </#if>
+                </#list>
+                <!-- NtoN  end-->
+            </div>
+        </form>
+    </section>
+    <section class="form" >
+        <form>
+            <div>
+                <!-- OneToN -->
+                <#list model.formFieldsOneToN as field>
+                    <!--query filter 1toN -->
+                    <#assign entitySearch = "">
+                    <!-- query filter 1toN end-->
+                    <datasource
+                            data-component="crn-datasource"
+                            filter=""
+                            name="${field.getName()}Grid"
+                            entity="${model.namespace}.${field.getName()}"
+                            keys="${model.getDataSourcePrimaryKeys(field)}"
+                            dependent-lazy-post="${model.dataSourceName}"
+                            rows-per-page="100"
+                            parameters="${model.getParametersDataSource(field)}"
+                            schema="${model.getDSSchema(field.getName())}"
+                            lazy=true>
+                    </datasource>
+                    <!-- teste -->
+                    <h2 class="lead component-holder text-left" data-component="crn-subtitle"><#if field.getClazz()?? && field.getClazz().getRealName()?? && field.getClazz().getRealName()?has_content>${field.getClazz().getRealName()}<#else>${field.getName()}</#if> </h2>
+                    <div class="component-holder ng-binding ng-scope" data-component="crn-cron-grid" id="crn-grid-${field.getName()}Grid-${model.random}">
+                        <#assign classname = "${field.clazz.name}">
+                        <#assign dataSourceName = "${classname}Grid">
+                        <cron-grid options="${model.getGridOptions(classname, dataSourceName, field)}" ng-model="vars.${dataSourceName}${model.random}" class="" style=""></cron-grid>
+                    </div>
+                </#list>
+                <!-- OneToOne  end -->
+            </div>
+        </form>
+    </section>
+</div>
+<#if model.hasFieldGridNtoN()?? && model.hasFieldGridNtoN()>
+    <#list model.formFieldsNToN as field>
+        <#assign nomeModal = "modal${field.getName()}Grid">
+        <#if field.isNToN() && field.getProperty("NToNOption")?has_content && field.getProperty("NToNOption") == "Grade">
+            <div class="modal fade" id="modal${field.getName()}Grid">
+                <div class="modal-dialog">
+                    <div class="modal-content">
+                        <form>
+                            <div class="modal-header">
+                                <button type="button" class="close" data-dismiss="modal" aria-label="{{'Home.view.Close' | translate}}"><span aria-hidden="true">×</span></button>
+                                <h3 class="modal-title">${field.getName()}</h3>
+                            </div>
+                            <div class="modal-body">
+                                <div class="list-group list-group-sm row">
+                                    <#assign relationClassName = "">
+                                    <#assign dataSourceName = "${field.getClazz().getName()}">
+                                    <#assign dataSourceCombo = "${field.fullType}NCombo">
+                                    <#assign keyField = "">
+                                    <#assign textField = "">
+                                    <#if field.getFullType()?? && model.getManyToManyRelationship(field.getFullType())??>
+                                        <#assign relationClassName = "${model.getManyToManyRelationship(field.getFullType()).getRelationClass().getName()}">
+                                        <#assign keyField = "${model.getJoinKeys(model.getManyToManyRelationship(field.getFullType()).getRelationClass().getPrimaryKeys())}">
+                                        <#assign textField = "${model.getManyToManyRelationship(field.getFullType()).getRelationClass().getFirstStringFieldNonPrimaryKey().getName()}">
+                                    </#if>
+                                    <datasource data-component="crn-datasource" name="${dataSourceCombo}" entity="${model.namespace}.${relationClassName}" keys="${keyField}" schema="${model.getDSSchema(field.fullType)}" lazy=true></datasource>
+                                    <div data-component="crn-enterprise-dynamic-combobox" id="modal-combo${field.getName()}-${model.random}" class="component-holder ng-binding ng-scope">
+                                        <div class="form-group">
+                                            <label for="combobox-modal-${field.getName()}${model.random}" class=""><#if field.label?has_content>${field.label}<#else>${field.name?capitalize}</#if></label>
+                                            <cron-dynamic-select
+                                                    id="combobox-modal-${field.getName()}${model.random}"
+                                                    name="combobox-modal-${field.getName()}${model.random}"
+                                                    options="${model.getComboOptions(field.fullType, textField, keyField, dataSourceCombo)}"
+                                                    ng-model="${dataSourceName}.active.${field.relationField}"
+                                                    class="crn-select form-control" <#if !field.isNullable()>required="required"</#if>>
+                                            </cron-dynamic-select>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="modal-footer">
+                                <div class="component-holder ng-scope" data-component="crn-button" id="crn-button-grid-save-button-modal">
+                                    <button class="btn k-button btn-block btn-success grid-save-button-modal" ng-click="${dataSourceName}.active.${model.getTextRelationField(field)}=${dataSourceCombo}.active.${textField}; ${dataSourceName}.post();" onclick="(!${dataSourceName}.missingRequiredField()?$('#${nomeModal}').modal('hide'):void(0))" xattr-fullsize="btn-block" xattr-theme="btn-success" xattr-disabled="">
+                                        <i class="k-icon k-i-check" icon-theme=""></i>
+                                    </button>
+                                </div>
+                                <div class="component-holder ng-scope" data-component="crn-button" id="crn-button-grid-cancel-button-modal">
+                                    <button class="btn k-button btn-block btn-danger" ng-click="${dataSourceName}.active.${model.getTextRelationField(field)}=${dataSourceCombo}.active.${textField}; ${dataSourceName}.post();" onclick="(!${dataSourceName}.missingRequiredField()?$('#${nomeModal}').modal('hide'):void(0))" xattr-fullsize="btn-block" xattr-theme="btn-danger" xattr-disabled="">
+                                        <i class="k-icon k-i-cancel" icon-theme=""></i>
+                                    </button>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            </div>
+        </#if>
+    </#list>
+</#if>
+<#list model.formFieldsOneToN as field>
+    <div class="modal fade" id="modal${field.getName()}Grid">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <form>
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="{{'Home.view.Close' | translate}}"><span aria-hidden="true">×</span></button>
+                        <h3 class="modal-title">${field.getName()}</h3>
+                    </div>
+                    <div class="modal-body">
+                        <div class="list-group list-group-sm row">
+                            <#list field.getClazz().getFields() as gField>
+                                <#if gField.isReverseRelation() || gField.isRelation() >
+                                    <#if (field.getDbFieldName() != gField.getDbFieldName())>
+                                        <#assign dataSourceCombo = "${gField.getRelationClazz().getName()}GridForCombo">
+                                        <datasource name="${dataSourceCombo}" entity="${model.namespace}.${gField.getRelationClazz().getName()}" keys="${model.getDataSourcePrimaryKeys(gField)}" rows-per-page="100" schema="${model.getDSSchema(gField.getRelationClazz().getName())}" lazy=true></datasource>
+                                        <div data-component="crn-enterprise-dynamic-combobox" id="crn-combobox-${field.getName()}Grid.active.${gField.getName()}-${model.random}" class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+                                            <div class="form-group">
+                                                <label for="combobox-modal-${gField.getName()}-${model.random}" class=""><#if gField.label?has_content>${gField.label}<#else>${gField.name?capitalize}</#if></label>
+                                                <cron-dynamic-select
+                                                        <#if !field.isNullable()>required="required"</#if>
+                                                        id="combobox-modal-${gField.getName()}-${model.random}"
+                                                        name="combobox-modal-${gField.getName()}-${model.random}"
+                                                        options="${model.getComboOptions(gField.type, gField.getRelationClazz().getFirstStringFieldNonPrimaryKey().getName(), gField.getRelationClazz().getNameKeys(), dataSourceCombo)}"
+                                                        ng-model="${field.getName()}Grid.active.${gField.getName()}"
+                                                        class="crn-select form-control">
+                                                </cron-dynamic-select>
+                                            </div>
+                                        </div>
+                                    </#if>
+                                <#elseif (!gField.isPrimaryKey() || field.getClazz().hasCompositeKey())>
+                                    <#assign dataComponentType = "crn-textinput">
+                                    <#if gField.isImage()>
+                                        <#assign dataComponentType = "crn-dynamic-image">
+                                    <#elseif gField.isFile()>
+                                        <#assign dataComponentType = "crn-dynamic-file">
+                                    <#elseif gField.isBoolean()>
+                                        <#assign dataComponentType = "crn-enterprise-checkbox">
+                                    </#if>
+                                    <div data-component="${dataComponentType}"  id="crn-modal-textinput-${gField.getDbFieldName()}-${model.random}" class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
+                                        <div class="form-group">
+                                            <#if !gField.isBoolean()>
+                                                <#if gField.isImage() || gField.isFile()>
+                                                <label for="textinput-modal-${gField.getDbFieldName()}-button"><#if gField.label?has_content>${gField.label?cap_first}<#else>${gField.name?capitalize}</#if></label>
+                                                <#else>
+                                                <label for="textinput-modal-${gField.getDbFieldName()}"><#if gField.label?has_content>${gField.label?cap_first}<#else>${gField.name?capitalize}</#if></label>
+                                                </#if>
+                                            </#if>
+                                            <#if gField.isImage()>
+                                                <div dynamic-image id="textinput-modal-${gField.getDbFieldName()}" ng-model="${field.getName()}Grid.active.${gField.getName()}" max-file-size="5MB" class="dynamic-image-container" <#if !gField.isNullable()>ng-required="true"<#else>ng-required="false"</#if>>
+                                                    {{"template.crud.clickOrDragAnImage" | translate}}
+                                                </div>
+                                            <#elseif gField.isBoolean() >
+                                                <input type="checkbox" <#if gField.isNullable()>crn-allow-null-values="true"<#else>crn-allow-null-values="false"</#if> class="k-checkbox" ng-model="${field.getName()}Grid.active.${gField.getName()}" id="cron-modal-checkbox-${gField.name}" <#if !gField.isNullable()>required="required"</#if>>
+                                                <label for="cron-modal-checkbox-${gField.name}" class="k-checkbox-label"><#if gField.label?has_content>${gField.label?cap_first}<#else>${gField.name?capitalize}</#if></label>
+                                            <#elseif gField.isFile()>
+                                                <div dynamic-file id="textinput-modal-${gField.getDbFieldName()}" ng-model="${field.getName()}Grid.active.${gField.getName()}" max-file-size="5MB" class="dynamic-image-container" <#if !gField.isNullable()>ng-required="true"<#else>ng-required="false"</#if>>
+                                                    {{"template.crud.clickOrDragAnFile" | translate}}
+                                                </div>
+                                            <#else>
+                                                <input type="<#if gField.isEncryption()>password<#else>${gField.getHtmlType()}</#if>"
+                                                        <#if gField.getLength()??>
+                                                            maxlength="${gField.getLength()?string["0"]}"
+                                                        </#if>
+                                                       ng-model="${field.getName()}Grid.active.${gField.getName()}" class="form-control k-textbox"
+                                                       id="textinput-modal-${gField.getDbFieldName()}"
+                                                       placeholder="<#if gField.label?has_content>${gField.label}<#else>${gField.name?capitalize}</#if>"
+                                                       mask="${model.formMapRelationFieldMasks[gField.name]}"
+                                                       mask-placeholder=""
+                                                        <#if model.formMapRelationFieldMasks[gField.name] == "999.999.999-99;0" >
+                                                            <#assign valid = "cpf" >
+                                                        <#elseif model.formMapRelationFieldMasks[gField.name] == "99.999.999/9999-99;0">
+                                                            <#assign valid = "cnpj" >
+                                                        </#if>
+                                                        <#if valid?has_content>
+                                                            valid="${valid}"
+                                                            data-error-message="{{'invalid.${valid}' | translate}}"
+                                                        </#if>
+                                                        <#if !gField.isNullable()>ng-required="true"<#else>ng-required="false"</#if>>
+                                            </#if>
+                                        </div>
+                                    </div>
+                                </#if>
+                            </#list>
+                        </div>
+                    </div>
+                    <div class="modal-footer">
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</#list>
+</div>

package/file/crud/angular_view_update/template.properties ADDED Viewed

@@ -0,0 +1,8 @@
+icon=update-web.png
+name=Formulário de Atualização Web
+description=Formulário para atualizar registros de uma fonte de dados
+projectType=W,M
+extension=.view.html
+preferedFolder=${webFolder}/views
+condition=webFolder
+order=0

package/file/crud/angular_view_update/template_en_US.properties ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ name=Web Form Update
2	+ description=Form to update records from a data source

package/file/crud/angular_view_update/update-web.png ADDED Viewed

Binary file

package/package.json CHANGED Viewed

@@ -1,5 +1,5 @@
 {
   "name": "@cronapp/templates",
-  "version": "2.9.2",
+  "version": "2.9.3-SP.2",
   "cronapp-ide-minimum-version": "2.5.0"
 }

package/project/M/cronapp-lyceum-project-mobile-cordova/template.properties CHANGED Viewed

@@ -11,10 +11,11 @@ mimetype.src.main.mobileapp.www=folder/web
 mimetype.src.main.webapp=folder/web
 mimetype.src.test.java=folder/regular
 mimetype.config=folder/servercontext
-billingPlan=developer,techne
+planTypes=techne,cronapp
 template.id=cronapp-lyceum-project-mobile-cordova
 features=ionic|angularjs|eclipselink|jpa|maven|springboot|cordova
+authenticationTypes=SSO
 parameter.page.1.string.0.appid=${generateAppId}
 parameter.page.1.boolean.1.frontend=true

package/project/M/cronapp-rad-project-mobile-cordova/src/main/mobileapp/www/www-autenticacao/i18n/locale_en_us.json CHANGED Viewed

@@ -1,5 +1,7 @@
 {
+  "Back": "Back",
   "directives.language-select.Language": "Language",
+  "Go.Home": "Go Home",
   "Login.view.Login": "Login",
   "Home.view.Admin": "Admin",
   "Home.view.Cidade": "City",
@@ -21,6 +23,7 @@
   "Permission.view.Remove": "Remove",
   "Permission.view.Edit": "Edit",
   "Permission.view.Select Person": "Select person",
+  "Retry": "Retry",
   "Roles.view.Name": "Name",
   "Roles.view.Remove": "Remove",
   "Roles.view.Load More": "Load more",

package/project/M/cronapp-rad-project-mobile-cordova/src/main/mobileapp/www/www-autenticacao/i18n/locale_pt_br.json CHANGED Viewed

@@ -1,5 +1,7 @@
 {
+  "Back": "Voltar",
   "directives.language-select.Language": "Idioma",
+  "Go.Home": "Ir Ao Início",
   "Login.view.Login": "Entrar",
   "Home.view.Admin": "Admin",
   "Home.view.Cidade": "Cidade",
@@ -21,6 +23,7 @@
   "Permission.view.Remove": "Remover",
   "Permission.view.Edit": "Editar",
   "Permission.view.Select Person": "Selecione uma pessoa",
+  "Retry": "Tentar Novamente",
   "Roles.view.Name": "Nome",
   "Roles.view.Remove": "Remover",
   "Roles.view.Load More": "Carregar mais",

package/project/M/cronapp-rad-project-mobile-cordova/src/main/mobileapp/www/www-autenticacao/views/error/403.view.html CHANGED Viewed

@@ -1,7 +1,10 @@
-<div class="card">
-  <div style="text-align : center !important;">
-    <i class=" ion-android-hand "></i>
-    <h3>403</h3>
-    <h5>{{'Forbidden' | translate}}</h5>
-  </div>
+<div class="card">
+  <div style="text-align : center !important;">
+    <i class=" ion-android-hand "></i>
+    <h3>403</h3>
+    <h5>{{'Forbidden' | translate}}</h5>
+    <button onclick="location.reload()">{{'Retry' | translate}}</button>
+    <button onclick="history.back()">{{'Back' | translate}}</button>
+    <button onclick="window.location.href = window.location.origin">{{'Go.Home' | translate}}</button>
+  </div>
 </div>

package/project/M/cronapp-rad-project-mobile-cordova/src/main/mobileapp/www/www-autenticacao/views/error/404.view.html CHANGED Viewed

@@ -1,7 +1,10 @@
-<div class="card">
-  <div style="text-align : center !important;">
-    <i class=" ion-android-hand "></i>
-    <h3>404</h3>
-    <h5>{{'PageNotFound' | translate}}</h5>
-  </div>
+<div class="card">
+  <div style="text-align : center !important;">
+    <i class=" ion-android-hand "></i>
+    <h3>404</h3>
+    <h5>{{'PageNotFound' | translate}}</h5>
+    <button onclick="location.reload()">{{'Retry' | translate}}</button>
+    <button onclick="history.back()">{{'Back' | translate}}</button>
+    <button onclick="window.location.href = window.location.origin">{{'Go.Home' | translate}}</button>
+  </div>
 </div>

package/project/M/cronapp-rad-project-mobile-cordova/src/main/mobileapp/www/www-sem-autenticacao/js/blockly/auth/Home.blockly CHANGED Viewed

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?><blockly formTarget="" resourceType="JS" ruleDescription="Home" ruleName="Home" ruleSynchronous="false" ruleTimeout="" ruleType="I">
-  <metadata scale="1" scrollx="357.0000000000002" scrolly="-123" target="Anb:u5+^,0vLkL9QIqn5"/>
-  <block colour="#995ba5" id="Anb:u5+^,0vLkL9QIqn5" origintype="procedures_defreturn" output="false" tooltip="Cria uma função que possui um valor de retorno." type="procedures_defreturn" x="-350" y="130">
-    <field name="NAME">change</field>
+<?xml version="1.0" encoding="UTF-8"?><blockly audit="false" blocklyType="" bpmnAble="false" formTarget="" library="false" resourceType="JS" ruleDescription="Home" ruleName="Home" ruleSynchronous="false" ruleTimeout="" ruleType="I" soap="false" swagger="false">
+  <metadata scale="1" scrollx="487.4999999999998" scrolly="-63.30000000000007" target="Anb:u5+^,0vLkL9QIqn5"/>
+  <block asynccall="false" colour="#995ba5" id="Anb:u5+^,0vLkL9QIqn5" origintype="procedures_defreturn" output="false" tooltip="Cria uma função que possui um valor de retorno." type="procedures_defreturn" x="-350" y="130">
+    <field customattributes="" name="NAME">change</field>
     <comment h="80" pinned="false" w="160">Home</comment>
     <statement name="STACK">
-      <block colour="#934848" dependencyby="Anb:u5+^,0vLkL9QIqn5" id="UQv[vJ.WyM+7,(wj:Mw|" multilayer="true" namespace="cronapi.screen.changeView" origintype="procedures_open_form_callnoreturn" output="false" returntype="ObjectType.VOID" tooltip="%3Cdiv%20class=%22name%22%3E%3Cstrong%3ENome:%3C/strong%3E%3Cdiv%3EMudar%20formul%C3%A1rio%3C/div%3E%3C/div%3E%3Cdiv%20class=%22description%22%3E%3Cstrong%3EDescri%C3%A7%C3%A3o:%3C/strong%3E%3Cdiv%3EFun%C3%A7%C3%A3o%20para%20mudar%20o%20formul%C3%A1rio%20corrente%3C/div%3E%3C/div%3E%3Cdiv%20class=%22params%22%3E%3Cstrong%3EParam%C3%AAtro:%3C/strong%3E%3Cdiv%3E%3Cspan%3E%20-%20Formul%C3%A1rio%20de%20destino%20:%20Texto%3C/span%3E%3Cbr%3E%3Cspan%3E%20-%20Par%C3%A2metros%20:%20Lista%3C/span%3E%3Cbr%3E%3C/div%3E%3C/div%3E%3Cdiv%20class=%22link%22%3E%3Cstrong%3EAjuda:%3C/strong%3E%3Cdiv%20class=%22tooltip-link%22%3E%3Ca%20target=%22_blank%22%20href=%22https://docs.cronapp.io/display/CRON2/cronapi.screen.changeView%22%3Ehttps://docs.cronapp.io/display/CRON2/cronapi.screen.changeView%3C/a%3E%3C/div%3E%3C/div%3E" type="procedures_open_form_callnoreturn">
-        <mutation data="%7B%22form%22:%22#/app/public/home%22,%22params%22:%22%5B%5D%22%7D" name="{{cronapi.screen.changeView}}"/>
+      <block asynccall="false" colour="#487f7f" dependencyby="Anb:u5+^,0vLkL9QIqn5" id="CaY}*Wwy6hi.D$j_/QB`" multilayer="true" namespace="cronapi.util.changeViewMain" origintype="procedures_callnoreturn" output="false" returntype="ObjectType.VOID" tooltip="%3Cdiv%20class=%22name%22%3E%3Cstrong%3ENome:%3C/strong%3E%3Cdiv%3EAlterar%20para%20rota%20padr%C3%A3o%3C/div%3E%3C/div%3E%3Cdiv%20class=%22description%22%3E%3Cstrong%3EDescri%C3%A7%C3%A3o:%3C/strong%3E%3Cdiv%3EAlterar%20para%20rota%20padr%C3%A3o%20que%20est%C3%A1%20definido%20no%20projeto%3C/div%3E%3C/div%3E%3Cdiv%20class=%22link%22%3E%3Cstrong%3EAjuda:%3C/strong%3E%3Cdiv%20class=%22tooltip-link%22%3E%3Ca%20target=%22_blank%22%20href=%22http://localhost:8080/help?type=blockly&amp;amp;id=cronapi.util.changeViewMain%22%3EAjuda%3C/a%3E%3C/div%3E%3C/div%3E" type="procedures_callnoreturn">
+        <mutation name="{{cronapi.util.changeViewMain}}" return-raw-type="undefined"/>
       </block>
     </statement>
   </block>

package/project/M/cronapp-rad-project-mobile-cordova/src/main/mobileapp/www/www-sem-autenticacao/js/blockly/auth/Home.blockly.js CHANGED Viewed

@@ -9,5 +9,5 @@ window.blockly.js.blockly.auth.Home = window.blockly.js.blockly.auth.Home || {};
  */
 window.blockly.js.blockly.auth.Home.change = function() {
-  this.cronapi.screen.changeView("#/app/public/home",[  ]);
+  this.cronapi.util.changeViewMain();
 }

package/project/M/cronapp-rad-project-mobile-cordova/src/main/mobileapp/www/www-sem-autenticacao/views/error/403.view.html CHANGED Viewed

@@ -1,7 +1,10 @@
-<div class="card">
-  <div style="text-align : center !important;">
-    <i class=" ion-android-hand "></i>
-    <h3>403</h3>
-    <h5>{{'Forbidden' | translate}}</h5>
-  </div>
+<div class="card">
+  <div style="text-align : center !important;">
+    <i class=" ion-android-hand "></i>
+    <h3>403</h3>
+    <h5>{{'Forbidden' | translate}}</h5>
+    <button onclick="location.reload()">{{'Retry' | translate}}</button>
+    <button onclick="history.back()">{{'Back' | translate}}</button>
+    <button onclick="window.location.href = window.location.origin">{{'Go.Home' | translate}}</button>
+  </div>
 </div>

package/project/M/cronapp-rad-project-mobile-cordova/src/main/mobileapp/www/www-sem-autenticacao/views/error/404.view.html CHANGED Viewed

@@ -1,7 +1,10 @@
-<div class="card">
-  <div style="text-align : center !important;">
-    <i class=" ion-android-hand "></i>
-    <h3>404</h3>
-    <h5>{{'PageNotFound' | translate}}</h5>
-  </div>
+<div class="card">
+  <div style="text-align : center !important;">
+    <i class=" ion-android-hand "></i>
+    <h3>404</h3>
+    <h5>{{'PageNotFound' | translate}}</h5>
+    <button onclick="location.reload()">{{'Retry' | translate}}</button>
+    <button onclick="history.back()">{{'Back' | translate}}</button>
+    <button onclick="window.location.href = window.location.origin">{{'Go.Home' | translate}}</button>
+  </div>
 </div>

package/project/M/cronapp-rad-project-mobile-cordova/template.properties CHANGED Viewed

@@ -96,7 +96,7 @@ maven.dependecies.new.dependency.14.artifactId=gson
 maven.dependecies.new.dependency.14.version=2.8.0
 features=ionic|angularjs|eclipselink|jpa|maven|springboot|cordova
+authenticationTypes=Nenhuma|Normal|Token|activeDirectory|ldap|SSO|Saml
 parameter.page.1.string.0.appid=${generateAppId}
 parameter.page.1.boolean.1.frontend=true
@@ -104,8 +104,8 @@ parameter.page.1.boolean.2.backend=true
 parameter.page.1.list.3.authentication=Token|SSO|Saml|Nenhuma
 parameter.page.1.list.6.social=Não|Sim
 parameter.page.1.list.7.mutual=Não|Sim
 parameter.page.2.theme.6.theme=Material|Aquamarine|Fuse|DsGov|Cerulean|Cosmo|Cyborg|Darkly|Flatly|Journal|Lumen|Paper|Readable|Sandstone|Simplex|Slate|Spacelab|Superhero|United|Yeti
 themeDescription.Aquamarine=O tema Aquamarine utiliza o padrão de HTML e CSS do Bootstrap 🆕
 themeDescription.Fuse=O tema Fuse utiliza o padrão de HTML e CSS do Bootstrap 🆕
 themeDescription.DsGov=O tema DsGov utiliza o padrão de HTML e CSS do Gov.br 🆕

package/project/W/cronapp-rad-project/Dockerfile CHANGED Viewed

@@ -1,22 +1,26 @@
+## Consulte a documentação do Docker em https://docs.cronapp.io para informações sobre o conteúdo desse arquivo.
 FROM alpine:3.12.0 as maven_builder
 RUN apk add --no-cache --update-cache maven openjdk11 npm git bash
 WORKDIR /app
 ADD pom.xml /app/pom.xml
 RUN git config --global url."https://".insteadOf git://
-# Usando repositórios externo - JAR e NPM
-RUN mvn dependency:go-offline -B
-ADD . /app
-# Consulte https://docs.cronapp.io e busque por Novos parâmetros para gerar .war para mais informações sobre o TIER e CONTEXT_USE
 ARG TIER
 ARG CONTEXT_USE
 ARG MOBILE_APP
+## Para repositório EXTERNO não é necessário alterações.
+## Para repositório INTERNO comente as linhas 16, 17 e 18 e retire os comentários nas linhas 21, 22, 23 e 24.
+## Usando repositórios externo - JAR e NPM
+RUN mvn dependency:go-offline -B
+ADD . /app
 RUN cd /app && mvn package -X -Dcronapp.profile=${TIER} -Dcronapp.useContext=${CONTEXT_USE} -Dcronapp.mobileapp=${MOBILE_APP}
-# Usando repositórios JAR e NPM interno, comente as linhas equivalente acima, e logo após descomente do ADD até o último comando RUN
+## Usando repositórios interno - JAR e NPM
 #ADD settings.xml  $HOME/.m2/settings.xml
 #RUN npm config set registry https://my.registry.com/your-repository/name && mvn -s /app/settings.xml dependency:go-offline -B
 #ADD . /app
-#ARG TIER
-#ARG CONTEXT_USE
 #RUN cd /app && mvn -s /app/settings.xml package -X -Dcronapp.profile=${TIER} -Dcronapp.useContext=${CONTEXT_USE} -Dcronapp.mobileapp=${MOBILE_APP}
 FROM tomcat:9.0.17-jre11

package/project/W/cronapp-rad-project/diagram/app.umlcd CHANGED Viewed

@@ -359,7 +359,7 @@
           "referencedColumnName": "",
           "isSearchable": false,
           "sequence": "",
-          "isCascade": false,
+          "isCascade": true,
           "isVersion": false,
           "storageId": "",
           "storageKey": "",
@@ -1308,7 +1308,7 @@
           "referencedColumnName": "",
           "isSearchable": false,
           "sequence": "",
-          "isCascade": false
+          "isCascade": true
         }
       ],
       "id": "2016ad54-a0f9-4337-ad10-694a48f0435c",

package/project/W/cronapp-rad-project/pom.xml.ftl CHANGED Viewed

@@ -197,38 +197,6 @@
         </dependency>
 </#if>
     </dependencies>
-    <repositories>
-        <repository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <id>central</id>
-            <name>libs-release</name>
-            <url>https://artifactory.cronapp.io/libs-release</url>
-        </repository>
-        <repository>
-            <snapshots />
-            <id>snapshots</id>
-            <name>libs-snapshot</name>
-            <url>https://artifactory.cronapp.io/libs-snapshot</url>
-        </repository>
-    </repositories>
-    <pluginRepositories>
-        <pluginRepository>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <id>central</id>
-            <name>plugins-release</name>
-            <url>https://artifactory.cronapp.io/plugins-release</url>
-        </pluginRepository>
-        <pluginRepository>
-            <snapshots />
-            <id>snapshots</id>
-            <name>plugins-snapshot</name>
-            <url>https://artifactory.cronapp.io/plugins-snapshot</url>
-        </pluginRepository>
-    </pluginRepositories>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

package/project/W/cronapp-rad-project/src/main/java/app/entity/ApplicationUser.java CHANGED Viewed

@@ -37,7 +37,7 @@ public class ApplicationUser implements Serializable {
     * @generated
     */
     @ManyToOne
-    @JoinColumn(name="application_id", nullable = true, referencedColumnName = "id", insertable=true, updatable=true, foreignKey = @ForeignKey(name = "", foreignKeyDefinition = "FOREIGN KEY (application_id) REFERENCES APPLICATION (id)"))
+    @JoinColumn(name = "application_id", nullable = true, referencedColumnName = "id", insertable = true, updatable = true, foreignKey = @ForeignKey(name = "APPLICATION_USER_APPLICATION_ID_APPLICATION_ID", foreignKeyDefinition = "FOREIGN KEY (application_id) REFERENCES APPLICATION (id) ON DELETE CASCADE"))
         private Application application;
@@ -45,7 +45,7 @@ public class ApplicationUser implements Serializable {
     * @generated
     */
     @ManyToOne
-    @JoinColumn(name="user_id", nullable = true, referencedColumnName = "id", insertable=true, updatable=true, foreignKey = @ForeignKey(name = "", foreignKeyDefinition = "FOREIGN KEY (user_id) REFERENCES USER (id)"))
+    @JoinColumn(name = "user_id", nullable = true, referencedColumnName = "id", insertable = true, updatable = true, foreignKey = @ForeignKey(name = "APPLICATION_USER_USER_ID_USER_ID", foreignKeyDefinition = "FOREIGN KEY (user_id) REFERENCES USER (id) ON DELETE CASCADE"))
         private User user;

package/project/W/cronapp-rad-project/src/main/java/app/entity/Login.java CHANGED Viewed

@@ -58,7 +58,7 @@ public class Login implements Serializable {
     * @generated
     */
     @ManyToOne
-    @JoinColumn(name="user_id", nullable = false, referencedColumnName = "id", insertable=true, updatable=true)
+    @JoinColumn(name = "user_id", nullable = false, referencedColumnName = "id", insertable = true, updatable = true, foreignKey = @ForeignKey(name = "LOGIN_USER_ID_USER_ID", foreignKeyDefinition = "FOREIGN KEY (user_id) REFERENCES USER (id) ON DELETE CASCADE"))
         private User user;

package/project/W/cronapp-rad-project/src/main/resources/application.properties CHANGED Viewed

@@ -21,5 +21,7 @@ security.oauth2.saml.privateKey=privateKey
 security.oauth2.saml.privateKeyPass=privateKeyPass
 security.oauth2.saml.storeFile=storeFile
 security.oauth2.saml.storePass=storePass
+security.oauth2.saml.maxAuthenticationAge=7200
+security.oauth2.saml.forceAuthN=false
 security.oauth2.sso.login-path=/login
 spring.output.ansi.enabled=ALWAYS

package/project/W/cronapp-rad-project/src/main/webapp-autenticacao/webapp/i18n/locale_en_us.json CHANGED Viewed

@@ -1,5 +1,7 @@
 {
+  "Back": "Back",
   "directives.language-select.Language": "Language",
+  "Go.Home": "Go Home",
   "Login.view.Login": "Login",
   "Home.view.Admin": "Admin",
   "Home.view.Cidade": "City",
@@ -21,6 +23,7 @@
   "Permission.view.Remove": "Remove",
   "Permission.view.Edit": "Edit",
   "Permission.view.Select Person": "Select person",
+  "Retry": "Retry",
   "Roles.view.Name": "Name",
   "Roles.view.Remove": "Remove",
   "Roles.view.Load More": "Load more",

package/project/W/cronapp-rad-project/src/main/webapp-autenticacao/webapp/i18n/locale_pt_br.json CHANGED Viewed

@@ -1,5 +1,7 @@
 {
+  "Back": "Voltar",
   "directives.language-select.Language": "Idioma",
+  "Go.Home": "Ir Ao Início",
   "Login.view.Login": "Entrar",
   "Home.view.Admin": "Admin",
   "Home.view.Cidade": "Cidade",
@@ -21,6 +23,7 @@
   "Permission.view.Remove": "Remover",
   "Permission.view.Edit": "Editar",
   "Permission.view.Select Person": "Selecione uma pessoa",
+  "Retry": "Tentar Novamente",
   "Roles.view.Name": "Nome",
   "Roles.view.Remove": "Remover",
   "Roles.view.Load More": "Carregar mais",

package/project/W/cronapp-rad-project/src/main/webapp-autenticacao/webapp/views/error/403.view.html CHANGED Viewed

@@ -1,13 +1,14 @@
 <div class="container-fluid">
-    <div class="row">
-        <div class="col-xs-8 col-sm-6 col-sm-offset-3 col-xs-offset-2 text-center">
-            <div class="">
-              <i class="fa fa-hand-paper-o fa-5x"></i>
-              <h3>403</h3>
-              <h5>{{'Forbidden' | translate}}</h5>
-            </div>
-        </div>
+  <div class="row">
+    <div class="col-xs-8 col-sm-6 col-sm-offset-3 col-xs-offset-2 text-center">
+      <div class="">
+        <i class="fa fa-hand-paper-o fa-5x"></i>
+        <h3>403</h3>
+        <h5>{{'Forbidden' | translate}}</h5>
+        <button onclick="location.reload()">{{'Retry' | translate}}</button>
+        <button onclick="history.back()">{{'Back' | translate}}</button>
+        <button onclick="window.location.href = window.location.origin">{{'Go.Home' | translate}}</button>
+      </div>
     </div>
+  </div>
 </div>

package/project/W/cronapp-rad-project/src/main/webapp-autenticacao/webapp/views/error/404.view.html CHANGED Viewed

@@ -1,13 +1,14 @@
 <div class="container-fluid">
-    <div class="row">
-        <div class="col-xs-8 col-sm-6 col-sm-offset-3 col-xs-offset-2 text-center">
-            <div class="">
-              <i class="fa fa-exclamation-circle fa-5x"></i>
-              <h3>404</h3>
-              <h5>{{'PageNotFound' | translate}}</h5>
-            </div>
-        </div>
+  <div class="row">
+    <div class="col-xs-8 col-sm-6 col-sm-offset-3 col-xs-offset-2 text-center">
+      <div class="">
+        <i class="fa fa-exclamation-circle fa-5x"></i>
+        <h3>404</h3>
+        <h5>{{'PageNotFound' | translate}}</h5>
+        <button onclick="location.reload()">{{'Retry' | translate}}</button>
+        <button onclick="history.back()">{{'Back' | translate}}</button>
+        <button onclick="window.location.href = window.location.origin">{{'Go.Home' | translate}}</button>
+      </div>
     </div>
+  </div>
 </div>

package/project/W/cronapp-rad-project/template.properties CHANGED Viewed

@@ -70,7 +70,7 @@ maven.dependecies.new.dependency.10.version=1.3.5.RELEASE
 maven.dependecies.new.dependency.10.scope=provided
 features=angularjs|eclipselink|jpa|maven|springboot
+authenticationTypes=Nenhuma|Normal|Token|activeDirectory|ldap|SSO|Saml
 parameter.page.1.string.0.appid=${generateAppId}
 parameter.page.1.boolean.1.frontend=true
@@ -80,6 +80,7 @@ parameter.page.1.list.4.menuPosition=Horizontal|Vertical
 parameter.page.1.list.6.social=Não|Sim
 parameter.page.1.list.7.mutual=Não|Sim
 parameter.page.2.theme.6.theme=Material|Aquamarine|Fuse|DsGov|Cosmo|Cyborg|Darkly|Flatly|Journal|Lumen|Paper|Readable|Sandstone|Simplex|Slate|Spacelab|Superhero|United|Yeti
 themeDescription.Aquamarine=O tema Aquamarine utiliza o padrão de HTML e CSS do Bootstrap 🆕
 themeDescription.Fuse=O tema Fuse utiliza o padrão de HTML e CSS do Bootstrap 🆕
 themeDescription.DsGov=O tema DsGov utiliza o padrão de HTML e CSS do Gov.br 🆕

package/templates/low-code/data-layer/ENTITIES.ftl CHANGED Viewed

@@ -223,7 +223,10 @@ public class ${clazz.name} implements Serializable {
             </#list>
     })
         <#else>
-    @Column(name = "${field.dbFieldName?replace("\"", "\\\"")}", nullable = ${field.nullable?c}<#if !field.primaryKey>, unique = ${field.unique?c}</#if><#if field.length??>, length=${field.length?c}</#if><#if field.precision??>, precision=${field.precision?c}</#if><#if field.scale??>, scale=${field.scale?c}</#if>, insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.columnDefinition??>, columnDefinition = "${field.columnDefinition}"</#if>)
+    <#if field.columnDefinition?? && field.columnDefinition == "TEXT" && persistenceProvider?upper_case == "ORACLE">
+    @Lob
+    </#if>
+    @Column(name = "${field.dbFieldName?replace("\"", "\\\"")}", nullable = ${field.nullable?c}<#if !field.primaryKey>, unique = ${field.unique?c}</#if><#if field.length??>, length=${field.length?c}</#if><#if field.precision??>, precision=${field.precision?c}</#if><#if field.scale??>, scale=${field.scale?c}</#if>, insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.columnDefinition?? && (field.columnDefinition != "TEXT" || persistenceProvider?upper_case != "ORACLE")>, columnDefinition = "${field.columnDefinition}"</#if>)
         </#if>
         ${field.modifier} <#if field.arrayRelation>${field.type}<#else>${field.type}</#if> ${name}<#if field.defaultValue?has_content> = ${field.defaultValue}<#elseif field.primaryKey && field.generationType?? && field.generationType == "UUID"> = UUID.randomUUID().toString().toUpperCase()</#if>;
     </#if>
@@ -280,7 +283,10 @@ public class ${clazz.name} implements Serializable {
                 <#elseif field.isTimestamp()>
     @Temporal(TemporalType.TIMESTAMP)
                 </#if>
-    @Column(name = "${field.dbFieldName?replace("\"", "\\\"")}", nullable = ${field.nullable?c}<#if !field.primaryKey>, unique = ${field.unique?c}</#if><#if field.length??>, length=${field.length?c}</#if><#if field.precision??>, precision=${field.precision?c}</#if><#if field.scale??>, scale=${field.scale?c}</#if>, insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.columnDefinition??>, columnDefinition = "${field.columnDefinition}"</#if>)
+    <#if field.columnDefinition?? && field.columnDefinition == "TEXT" && persistenceProvider?upper_case == "ORACLE">
+    @Lob
+    </#if>
+    @Column(name = "${field.dbFieldName?replace("\"", "\\\"")}", nullable = ${field.nullable?c}<#if !field.primaryKey>, unique = ${field.unique?c}</#if><#if field.length??>, length=${field.length?c}</#if><#if field.precision??>, precision=${field.precision?c}</#if><#if field.scale??>, scale=${field.scale?c}</#if>, insertable=${field.insertable?c}, updatable=${field.updatable?c}<#if field.columnDefinition?? && (field.columnDefinition != "TEXT" || persistenceProvider?upper_case != "ORACLE")>, columnDefinition = "${field.columnDefinition}"</#if>)
             </#if>
         </#if>
         <#if field.getUseOuterJoin()>

package/templates/low-code/data-layer/ENTITIESPK.ftl CHANGED Viewed

@@ -32,7 +32,7 @@ public class ${clazz.name + "PK"} implements Serializable {
   <#assign name = "${field.name}">
   <#if field.getProperty("FOREIGN")??>
     <#if name?contains('_')>
-      <#assign name = "${field.name?string[0..field.name?index_of('_') - 1]}">
+      <#assign name = "${field.name?string[0..field.name?last_index_of('_') - 1]}">
     </#if>
   </#if>
@@ -53,7 +53,7 @@ public class ${clazz.name + "PK"} implements Serializable {
   <#assign name = "${field.name}">
   <#if field.getProperty("FOREIGN")??>
     <#if name?contains('_')>
-      <#assign name = "${field.name?string[0..field.name?index_of('_') - 1]}">
+      <#assign name = "${field.name?string[0..field.name?last_index_of('_') - 1]}">
     </#if>
   </#if>
   /**
@@ -88,7 +88,7 @@ ${clazz.name + "PK"} object = (${clazz.name + "PK"})obj;
   <#assign name = "${field.name}">
   <#if field.getProperty("FOREIGN")??>
     <#if name?contains('_')>
-      <#assign name = "${field.name?string[0..field.name?index_of('_') - 1]}">
+      <#assign name = "${field.name?string[0..field.name?last_index_of('_') - 1]}">
     </#if>
   </#if>
     if (${name} != null ? !${name}.equals(object.${name}) : object.${name} != null) return false;
@@ -106,7 +106,7 @@ ${clazz.name + "PK"} object = (${clazz.name + "PK"})obj;
   <#assign name = "${field.name}">
   <#if field.getProperty("FOREIGN")??>
     <#if name?contains('_')>
-      <#assign name = "${field.name?string[0..field.name?index_of('_') - 1]}">
+      <#assign name = "${field.name?string[0..field.name?last_index_of('_') - 1]}">
     </#if>
   </#if>
   <#if !field.isTypePrimitive()>

package/templates/low-code/data-layer/SecurityPermission.java.ftl CHANGED Viewed

@@ -16,28 +16,38 @@ public class SecurityPermission implements Permission {
   public void loadSecurityPermission(HttpSecurity http) throws Exception {
     // public
+<#if listPermitAll??>
   	<#list listPermitAll as role>
   	${role}
   	</#list>
+</#if>
   	// role hasAuthority permission
+<#if listHasAuthority??>
   	<#list listHasAuthority as role>
   	${role}
   	</#list>
+</#if>
 	// role hasAnyAuthority permission
+<#if listHasAnyAuthority??>
 	<#list listHasAnyAuthority as role>
 	${role}
 	</#list>
+</#if>
   	// autenticated
+<#if listAutenticated??>
   	<#list listAutenticated as role>
   	${role}
   	</#list>
+</#if>
   	// deny all
-  	<#list listDenyAll as role>
-  	${role}
-  	</#list>
+<#if listDenyAll??>
+	<#list listDenyAll as role>
+	${role}
+	</#list>
+</#if>
   }
-}
+}

package/file/view.html/EmptyCrudHtml/__FileName__.view.html.ftl DELETED Viewed

@@ -1,69 +0,0 @@
-<h2 class="component-holder text-left h3 title">Title</h2>
-<datasource data-component="crn-datasource" filter="" name="MainDatasource" entity="" keys="" rows-per-page="100" class="" schema="" lazy=""></datasource>
-<div role="search" ng-hide="MainDatasource.inserting || MainDatasource.editing" data-component="crn-datasource-filter" id="crn-datasource-filter" class="">
-  <div class="form-group">
-    <label for="textinput-filter" class="">{{"template.crud.search" | translate}}</label>
-    <input type="text" ng-model="vars.search" id="textinput-filter" class="form-control k-textbox" cronapp-filter="" cronapp-filter-operator="" cronapp-filter-caseinsensitive="false" cronapp-filter-autopost="true" crn-datasource="MainDatasource" value="" placeholder="{{'template.crud.search' | translate}}">
-  </div>
-</div>
-<section ng-hide="MainDatasource.editing || MainDatasource.inserting" class="component-holder ng-binding ng-scope" data-component="crn-cron-grid" id="cron-crn-grid-search">
-  <cron-grid options="{&quot;dataSourceScreen&quot;:{},&quot;allowPaging&quot;:true,&quot;allowSorting&quot;:true,&quot;allowGrouping&quot;:false,&quot;allowSelectionTotalPageToShow&quot;:true,&quot;allowRefreshGrid&quot;:true,&quot;allowSelectionRow&quot;:true,&quot;editable&quot;:&quot;datasource&quot;,&quot;columns&quot;:[],&quot;toolBarButtons&quot;:[{&quot;type&quot;:&quot;Native&quot;,&quot;title&quot;:&quot;create&quot;}],&quot;details&quot;:[]}" ng-model="vars.gridmain" class="" style="">
-  </cron-grid>
-</section>
-<div data-component="crn-form" id="crn-form-form">
-  <section class="form" ng-show="MainDatasource.editing || MainDatasource.inserting">
-    <form crn-datasource="MainDatasource" class="">
-        <div class="tool-bar" ng-hide="datasource.editing || datasource.inserting">
-          <div class="component-holder ng-scope" data-component="crn-button" id="crn-button-startInserting">
-            <button class="btn k-button btn-block btn-default btn-fab" ng-click="datasource.startInserting()" aria-label="{{'StartInserting' | translate}}" xattr-fullsize="btn-block" xattr-theme="btn-default" xattr-disabled="">
-              <i class="glyphicon glyphicon-plus" icon-theme=""></i>
-            </button>
-          </div>
-          <div class="component-holder ng-scope" data-component="crn-button" id="crn-button-startEditing">
-            <button class="btn k-button btn-block btn-default btn-fab" ng-click="datasource.startEditing()" aria-label="{{'startEditing' | translate}}" xattr-fullsize="btn-block" xattr-theme="btn-default" xattr-disabled="">
-              <i class="glyphicon glyphicon-pencil" icon-theme=""></i>
-            </button>
-          </div>
-          <div class="component-holder ng-scope" data-component="crn-button" id="crn-button-previous">
-            <button class="btn k-button btn-block btn-default btn-fab" ng-click="datasource.previous()" ng-disabled="!datasource.hasPrevious()" aria-label="{{'Before' | translate}}" xattr-fullsize="btn-block" xattr-theme="btn-default" xattr-disabled="">
-              <i class="glyphicon glyphicon-chevron-left" icon-theme=""></i>
-            </button>
-          </div>
-          <div class="component-holder ng-scope" data-component="crn-button" id="crn-button-next">
-            <button class="btn k-button btn-block btn-default btn-fab" ng-click="datasource.next()" ng-disabled="!datasource.hasNext()" aria-label="{{'Next' | translate}}" xattr-fullsize="btn-block" xattr-theme="btn-default" xattr-disabled="">
-              <i class="glyphicon glyphicon-chevron-right" icon-theme=""></i>
-            </button>
-          </div>
-          <div class="component-holder ng-scope" data-component="crn-button" id="crn-button-remove">
-            <button class="btn k-button btn-block btn-danger btn-fab" ng-click="datasource.remove()" aria-label="{{'Remove' | translate}}" xattr-fullsize="btn-block" xattr-theme="btn-danger" xattr-disabled="">
-              <i class="glyphicon glyphicon-remove" icon-theme=""></i>
-            </button>
-          </div>
-        </div>
-        <div class="active-bar" ng-hide="!datasource.editing &amp;&amp; !datasource.inserting">
-          <div class="component-holder ng-scope" data-component="crn-button" id="btn_crud_post_${model.random}">
-            <button class="btn k-button btn-block btn-success btn-fab" ng-click="datasource.post()" aria-label="{{'SaveChanges' | translate}}" xattr-fullsize="btn-block" xattr-theme="btn-success" xattr-disabled="">
-              <i class="glyphicon glyphicon-ok" icon-theme=""></i>
-            </button>
-          </div>
-          <div class="component-holder ng-scope" data-component="crn-button" id="btn_crud_cancel_${model.random}">
-            <button class="btn k-button btn-block btn-danger btn-fab" ng-click="datasource.cancel()" aria-label="{{'CancelChanges' | translate}}" xattr-fullsize="btn-block" xattr-theme="btn-danger" xattr-disabled="">
-              <i class="glyphicon glyphicon-ban-circle" icon-theme=""></i>
-            </button>
-          </div>
-      </div>
-      <br>
-      <fieldset ng-disabled="!datasource.editing &amp;&amp; !datasource.inserting">
-        <div class="component-holder ng-binding ng-scope" data-component="crn-textinput" id="crn-textinput-98075">
-          <div class="form-group">
-            <label for="input5045">Label</label>
-            <input type="text" mask="" mask-placeholder="" ng-required="false" ng-model="vars.input5045" class="form-control k-textbox" id="input5045" placeholder="Placeholder text">
-          </div>
-        </div>
-      </fieldset>
-    </form>
-  </section>
-</div>

package/file/view.html/EmptyCrudHtml/template.properties DELETED Viewed

@@ -1,7 +0,0 @@
-icon=view.html.png
-underFolders=webapp
-name=Crud From
-encoding=UTF-8
-parameter.string.FileName=File Name
-parameter.string.FileName.value=crud
-projectType=W

package/file/view.html/EmptyCrudHtml/template_pt_BR.properties DELETED Viewed

@@ -1,4 +0,0 @@
-icon=view.html.png
-name=Formulário Crud
-encoding=UTF-8
-parameter.string.FileName=Nome do Arquivo

package/file/view.html/EmptyCrudHtml/view.html.png DELETED Viewed

Binary file

/package/project/W/cronapp-rad-project/src/main/webapp-sem-autenticacao/webapp/views/{home.view.html.ftl → public/home.view.html.ftl} RENAMED Viewed

File without changes