wip

.gitignore

@@ -6,3 +6,4 @@ vendor/
 j4/pkg_agosms/sik
 j4/pkg_agosms/dist/
 j4/pkg_agosms/vendor/
+.vscode

j4/pkg_agosms/src/administrator/components/com_agosms/forms/agosm.xml

@@ -31,6 +31,33 @@
 			hint="JFIELD_ALIAS_PLACEHOLDER"
 		/>
 
+		<field
+			name="description"
+			type="editor"
+			label="COM_AGOSMS_FIELD_DESCRIPTION_LABEL"
+			filter="JComponentHelper::filterText"
+			buttons="true"
+		/>
+
+		<field
+			name="popuptext"
+			type="editor"
+			label="COM_AGOSMS_FIELD_DESCRIPTION_LABEL"
+			filter="JComponentHelper::filterText"
+			buttons="true"
+		/>
+
+		<field
+			name="coordinates"
+			type="text"
+			validate="Coordinates"
+			class="validate-coordinates"
+			label="COM_AGOSMS_FIELD_COORDINATES_LABEL"
+			size="40"
+			default="50,7"
+			required="true"
+		 />
+
 		<field
 			name="language"
 			type="contentlanguage"

j4/pkg_agosms/src/administrator/components/com_agosms/src/Rule/CoordinatesRule.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * Joomla! Content Management System
+ *
+ * @copyright  Copyright (C) 2005 - 2020 Open Source Matters, Inc. All rights reserved.
+ * @license    GNU General Public License version 2 or later; see LICENSE.txt
+ */
+
+namespace AgosmNamespace\Component\Agosms\Administrator\Rule;
+
+\defined('_JEXEC') or die;
+
+use Joomla\CMS\Form\FormRule;
+
+/**
+ * Form Rule class for the Joomla Platform.
+ *
+ * @since  __DEPLOY_VERSION__
+ */
+class CoordinatesRule extends FormRule
+{
+	/**
+	 * The regular expression to use in testing a form field value.
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $regex = '^([0-9.]+[,][0-9.]+)$';
+
+	/**
+	 * The regular expression modifiers to use when testing a form field value.
+	 *
+	 * @var    string
+	 * @since  __DEPLOY_VERSION__
+	 */
+	protected $modifiers = 'i';
+}

j4/pkg_agosms/src/administrator/components/com_agosms/src/View/Agosms/HtmlView.php

@@ -87,8 +87,7 @@ public function display($tpl = null): void
 		$this->activeFilters = $this->get('ActiveFilters');
 		$this->state = $this->get('State');
 
-		if (!count($this->items) && $this->get('IsEmptyState'))
-		{
+		if (!count($this->items) && $this->get('IsEmptyState')) {
 			$this->setLayout('emptystate');
 		}
 

j4/pkg_agosms/src/administrator/components/com_agosms/tmpl/agosm/edit.php

@@ -43,7 +43,11 @@
 			<div class="col-md-9">
 				<div class="row">
 					<div class="col-md-6">
-						<?php echo 'Hier ist Platz für die Inhalte deiner Erweiterung'; ?>
+						<?php echo Text::_('COM_AGOSMS_NEW_AGOSM_DESC'); ?>
+						<?php echo $this->getForm()->renderField('description'); ?>
+						<?php echo Text::_('COM_AGOSMS_NEW_AGOSM_POPUP'); ?>
+						<?php echo $this->getForm()->renderField('popuptext'); ?>
+						<?php echo $this->getForm()->renderField('coordinates'); ?>
 					</div>
 				</div>
 			</div>

j4/pkg_agosms/src/administrator/components/com_agosms/tmpl/agosms/emptystate.php

@@ -21,8 +21,7 @@
 
 $user = Factory::getApplication()->getIdentity();
 
-if ($user->authorise('core.create', 'com_agosms') || count($user->getAuthorisedCategories('com_agosms', 'core.create')) > 0)
-{
+if ($user->authorise('core.create', 'com_agosms') || count($user->getAuthorisedCategories('com_agosms', 'core.create')) > 0) {
 	$displayData['createURL'] = 'index.php?option=com_agosms&task=agosm.add';
 }
 

j4/pkg_agosms/src/components/com_agosms/src/Model/AgosmModel.php

@@ -40,7 +40,10 @@ class AgosmModel extends BaseDatabaseModel
 	public function getItem($pk = null)
 	{
 		$app = Factory::getApplication();
-		$pk = $app->input->getInt('id');
+
+		if ($app->input->getInt('id') !== null) {
+			$pk = $app->input->getInt('id');
+		}
 
 		if ($this->_item === null) {
 			$this->_item = [];