app prefix by convention over configuration

Author: Guite

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/javascript/GeoFunctions.xtend

@@ -3,15 +3,13 @@ package org.zikula.modulestudio.generator.cartridges.symfony.controller.javascri
 import de.guite.modulestudio.metamodel.Application
 import org.zikula.modulestudio.generator.application.IMostFileSystemAccess
 import org.zikula.modulestudio.generator.extensions.ControllerExtensions
-import org.zikula.modulestudio.generator.extensions.FormattingExtensions
 import org.zikula.modulestudio.generator.extensions.ModelBehaviourExtensions
 import org.zikula.modulestudio.generator.extensions.NamingExtensions
 import org.zikula.modulestudio.generator.extensions.Utils
 
 class GeoFunctions {
 
     extension ControllerExtensions = new ControllerExtensions
-    extension FormattingExtensions = new FormattingExtensions
     extension ModelBehaviourExtensions = new ModelBehaviourExtensions
     extension NamingExtensions = new NamingExtensions
     extension Utils = new Utils
@@ -174,7 +172,6 @@ class GeoFunctions {
 
         var map;
         var objectType;
-        var fieldPrefix;
         var entityMarkers;
         var labelMarkers;
 
@@ -219,7 +216,7 @@ class GeoFunctions {
 
             for (var i = 0; i < markerData.length; i++) {
                 var marker = markerData[i];
-                var markerCaption = (marker.image ? '<img src="' + marker.image + '" alt="Logo" style="max-width: 100px !important" /><br />' : '') + marker.title;
+                var markerCaption = (marker.image ? '<img src="' + marker.image + '" alt="Image" style="max-width: 100px !important" /><br />' : '') + marker.title;
                 if ('undefined' !== typeof marker.detailUrl && marker.detailUrl) {
                     markerCaption += '<br /><a href="' + marker.detailUrl + '" target="_blank"><i class="fas fa-arrow-circle-right"></i> Details</a>';
                 }
@@ -267,7 +264,6 @@ class GeoFunctions {
             }
 
             objectType = infoElem.data('object-type');
-            fieldPrefix = '#«appName.toLowerCase»_' + objectType + 'quicknav_';
 
             parameters = {
                 tileLayerUrl: infoElem.data('tile-layer-url'),
@@ -276,11 +272,13 @@ class GeoFunctions {
 
             if ('index' == infoElem.data('context')) {
                 «vendorAndName»InitGeographicalView(parameters);
-
+«/* TODO
                 jQuery('.«appName.formatForDB»-quicknav').removeClass('form-inline');
                 jQuery('.«appName.formatForDB»-quicknav input, .«appName.formatForDB»-quicknav select')
                     .css('width', '100%')
                 ;
+*/»
+                */
             }
         });
     '''

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/view/pages/view/ViewMap.xtend

@@ -42,7 +42,7 @@ class ViewMap {
                 </div>
                 «(new IndexPagesHelper).pagerCall(it)»
                 {% for «name.formatForCode» in items|filter(i => i.latitude|default != 0 and i.longitude|default != 0) %}
-                    <div class="map-marker-definition" data-latitude="{{ «name.formatForCode».latitude|e('html_attr') }}" data-longitude="{{ «name.formatForCode».longitude|e('html_attr') }}" data-title="{{ «name.formatForCode»|«appName.formatForDB»_formattedTitle|e('html_attr') }}" data-image="«IF null !== getMapImageField»{% if «name.formatForCode».«getMapImageField.name.formatForCode» is not empty and «name.formatForCode».«getMapImageField.name.formatForCode»Meta|default %}{{ «name.formatForCode».«getMapImageField.name.formatForCode»Url|e('html_attr') }}{% endif %}«ENDIF»" data-detail-url="«IF hasDetailAction»{{ path('«appName.formatForDB»_«name.formatForCode»_detail'«routeParams(name.formatForCode, true)»)|e('html_attr') }}«ENDIF»"></div>
+                    <div class="map-marker-definition" data-latitude="{{ «name.formatForCode».latitude|e('html_attr') }}" data-longitude="{{ «name.formatForCode».longitude|e('html_attr') }}" data-title="{{ «name.formatForCode»|«appName.formatForDB»_formattedTitle|e('html_attr') }}" data-image="«itemImageUrl»" data-detail-url="«IF hasDetailAction»{{ path('«appName.formatForDB»_«name.formatForCode»_detail'«routeParams(name.formatForCode, true)»)|e('html_attr') }}«ENDIF»"></div>
                 {% endfor %}
             </div>
         {% endblock %}
@@ -53,6 +53,10 @@ class ViewMap {
         {% endblock %}
     '''
 
+    def private getItemImageUrl(Entity it) '''
+        «IF null !== getMapImageField»{% if «name.formatForCode».«getMapImageField.name.formatForCode» is not empty and «name.formatForCode».«getMapImageField.name.formatForCode»Meta|default %}{{ «name.formatForCode».«getMapImageField.name.formatForCode»Url|e('html_attr') }}{% endif %}«ENDIF»
+    '''
+
     def private getMapImageField(Entity it) {
         if (getUploadFieldsEntity.filter[isOnlyImageField].empty) {
             return null