Einige Probleme nach merge (Fehlende Zeilen) behoben und Anregungen v…

…on sebastianroming implementiert

src/Frontend/ReportList.php

@@ -206,7 +206,7 @@ private function constructList($reports, $args)
  $this->insertTableHeader();
  }
 
- if( $this->options->isGMapActivate() != "" && $this->showMap) {
+ if( $this->options->isGMapActivate() && $this->showMap) {
  $latLon = explode(",", $this->options->getGMapDefaultPos() );
  $mapstring = "<style>#map-canvas {height: 300px; margin-bottom: 30px; position: relative; overflow: hidden; transform: translateZ(0px); background-color: rgb(229, 227, 223);}</style>";
  $mapstring .= "<div class='einsatzliste-map'>";

src/Model/IncidentReport.php

@@ -76,7 +76,7 @@ public static function getMetaFields()
  'label' => 'Einsatzort'
  ),
  'einsatz_location' => array(
- 'label' => 'Goolemaps Position'
+ 'label' => 'Google Maps Position'
  ),
  'einsatz_einsatzleiter' => array(
  'label' => 'Einsatzleiter'

src/einsatzverwaltung-admin.php

@@ -281,7 +281,7 @@ private function echoInputText($label, $name, $value, $placeholder = '', $size =
  */
  private function echoGMap($location)
  {
- if($location != "")
+ if(!empty($location ))
  {
  $latLon = explode(",",$location);
  }

src/einsatzverwaltung-core.php

@@ -361,6 +361,7 @@ public function onDeactivation()
  public function onInit()
  {
  $this->registerTypes();
+ $this->registerScripts(); 
  $this->addRewriteRules();
  if ($this->options->isFlushRewriteRules()) {
  flush_rewrite_rules();
@@ -416,6 +417,21 @@ private function registerTypes()
  ));
  }
 
+ /**
+ * Registriert externe Scripts
+ */
+ private function registerScripts()
+ {
+ if( $this->options->isGMapActivate() ) {
+ /* Google Maps */
+ $protocal = is_ssl() ? 'https://' : 'http:https://';
+ $url = add_query_arg( array(
+ 'key' => $this->options->getGMapAPI(),
+ ), "{$protocal}maps.googleapis.com/maps/api/js");
+ wp_register_script( 'einsatzvw_GoogleMap', $url );
+ }
+ } 
+
  private function addRewriteRules()
  {
  global $wp_rewrite;

src/einsatzverwaltung-settings.php

@@ -192,6 +192,19 @@ public function registerSettings()
  'einsatzvw_list_ext_link',
  array($this->utilities, 'sanitizeCheckbox')
  );
+ register_setting(
+ 'einsatzvw_settings',
+ 'einsatzvw_gmap',
+ array($this->utilities, 'sanitizeCheckbox')
+ );
+ register_setting(
+ 'einsatzvw_settings',
+ 'einsatzvw_gmap_api'
+ );
+ register_setting(
+ 'einsatzvw_settings',
+ 'einsatzvw_gmap_default_pos'
+ ); 
  register_setting(
  'einsatzvw_settings',
  'einsatzvw_list_annotations_color_off',
@@ -338,6 +351,13 @@ private function addSettingsFields()
  self::EVW_SETTINGS_SLUG,
  'einsatzvw_settings_einsatzberichte'
  );
+ add_settings_field(
+ 'einsatzvw_settings_gmap',
+ 'Google Maps',
+ array($this, 'echoSettingsGmap'),
+ self::EVW_SETTINGS_SLUG,
+ 'einsatzvw_settings_einsatzberichte'
+ ); 
  add_settings_field(
  'einsatzvw_settings_columns',
  'Spalten der Einsatzliste',
@@ -575,6 +595,32 @@ public function echoSettingsExcerpt()
  }
 
 
+ /**
+ * Gibt die Einstellmöglichkeiten für Google-Maps aus
+ */
+ public function echoSettingsGmap()
+ {
+ $this->echoSettingsCheckbox(
+ 'einsatzvw_gmap',
+ 'Googel Maps aktivieren',
+ $this->options->isGMapActivate()
+ );
+ echo '<p>Googel Maps JavaScript API-Key:&nbsp;';
+ $this->echoSettingsInput(
+ 'einsatzvw_gmap_api',
+ 'Wie generiere ich einen <a href="https://developers.google.com/maps/documentation/javascript/get-api-key" target="_blank">API-Key</a>',
+ $this->options->getGMapAPI()
+ );
+ echo '<p>Standartposition der Karte:&nbsp;';
+ $this->echoSettingsInput(
+ 'einsatzvw_gmap_default_pos',
+ 'Als Lat,Lon: 53.523463,9.482329',
+ $this->options->getGMapDefaultPos()
+ );
+ }
+
+
+
  /**
  *
  */