From 4bf9c7e5be550c8adade6db016ea50554c5e7965 Mon Sep 17 00:00:00 2001
From: Daniel Schmitzer <noreply@maennchen1.de>
Date: Wed, 4 Sep 2019 13:42:10 +0000
Subject: - Statistik / Task #684

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@7555 0d5edaf7-2b12-4e95-93f4-047927463d4b
---
 views/mods/mod_kundenverwaltung/edit.phtml         |  1 -
 .../mods/mod_statistics/produkt_edit_sidebar.phtml | 17 +---
 views/mods/mod_statistics/simplefilter.phtml       | 73 +++++++++++-------
 views/mods/mod_statistics/statistics.phtml         | 90 +++++++++++-----------
 4 files changed, 92 insertions(+), 89 deletions(-)

(limited to 'views/mods')

diff --git a/views/mods/mod_kundenverwaltung/edit.phtml b/views/mods/mod_kundenverwaltung/edit.phtml
index 255e64c..915a9fe 100644
--- a/views/mods/mod_kundenverwaltung/edit.phtml
+++ b/views/mods/mod_kundenverwaltung/edit.phtml
@@ -30,7 +30,6 @@
 	</nav>
 	
 	<div class="wpsg_msg_wrap"><hr class="wp-header-end wpsg-wp-header-end"/></div>
-	
 	<div class="wpsg_clear"></div>
 
 	<div class="content form-horizontal">
diff --git a/views/mods/mod_statistics/produkt_edit_sidebar.phtml b/views/mods/mod_statistics/produkt_edit_sidebar.phtml
index ecb4430..639756f 100644
--- a/views/mods/mod_statistics/produkt_edit_sidebar.phtml
+++ b/views/mods/mod_statistics/produkt_edit_sidebar.phtml
@@ -111,22 +111,7 @@
 			location.href = '<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_statistics', 'export', array(
 			'edit_id' => $_REQUEST['edit_id']
 		)); ?>&von=' + jQuery('#st_von').val() + '&bis=' + jQuery('#st_bis').val();
-		
-		/*
-		jQuery.ajax( { 
-			url: '<?php echo $this->getUrl(wpsg_ShopController::URL_BASKET, 'wpsg_mod_statistics', 'export'); ?>',
-			data: {
-				'edit_id': <?php echo $_REQUEST['edit_id']?>,
-				'von': jQuery('#st_von').val(),
-				'bis': jQuery('#st_bis').val(),
-			},
-			success: function(data) {
-				//jQuery('#wpsg_statistic_div').replaceWith(data);
-					
-			}
-		});
-		*/
-
+		 
 		});
 
 
diff --git a/views/mods/mod_statistics/simplefilter.phtml b/views/mods/mod_statistics/simplefilter.phtml
index 9c8eb5b..50319a5 100644
--- a/views/mods/mod_statistics/simplefilter.phtml
+++ b/views/mods/mod_statistics/simplefilter.phtml
@@ -31,37 +31,51 @@
 
 </script>
 
-<?php foreach ($this->view['charts'][$_REQUEST['id']]['type'] as $type => $data) { ?>
+<?php /* foreach ($this->view['charts'][$_REQUEST['id']]['type'] as $type => $data) { ?>
 <a class="<?php echo (($_REQUEST['type'] == $type)?'current':''); ?>" href="admin.php?page=wpsg-Statistics&amp;id=<?php echo $_REQUEST['id']; ?>&amp;type=<?php echo $type; ?>"><?php echo wpsg_hspc($data['name']); ?></a>
-<?php } ?>
+<?php } */ ?>
 
 <br />
 
 <form name="wpsg_statistics_form" id="wpsg_statistics_form" method="post" action="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Statistics">
-	
-	<label style="width:5em; height:2em; line-height:2em; padding:2px; display:block; float:left;" for="filter-standard"><?php echo __('Auswahl', 'wpsg'); ?></label>
-	
-	<div style="float:left;" id="filter-standard-wrapper">	
-		<select name="filter[standard]" id="filter-standard" size="1" onchange="<?php if ($_REQUEST['id'] == 0 || $_REQUEST['id'] == 1) { ?>checkForRelated(this);<?php } ?>">
-		<?php foreach ($this->view['standardFilter'] as $index => $filter) { ?>
-			<option value="<?php echo wpsg_hspc($index)?>" <?php if ($index == $this->view['filter']['standard']) { ?>selected="selected"<?php } ?>><?php echo wpsg_hspc(wpsg_getStr($filter['name'])); ?></option>
-		<?php } ?>
-		</select>
-	</div>
-	
-	<div style="float:left;" id="filter-related-wrapper">
-	
+
+	<div style="display:flex; flex-direction:row; justify-content:flex-start; align-items:center;">
+		
+		<label style="width:5em; height:2em; line-height:2em; padding:2px; display:block;" for="filter-standard"><?php echo __('Auswahl', 'wpsg'); ?></label>
+		
+		<div style="" id="filter-standard-wrapper">	
+			<select name="filter[standard]" id="filter-standard" size="1" onchange="<?php if ($_REQUEST['id'] == 0 || $_REQUEST['id'] == 1) { ?>checkForRelated(this);<?php } ?>">
+			<?php foreach ($this->view['standardFilter'] as $index => $filter) { ?>
+				<option value="<?php echo wpsg_hspc($index)?>" <?php if ($index == $this->view['filter']['standard']) { ?>selected="selected"<?php } ?>><?php echo wpsg_hspc(wpsg_getStr($filter['name'])); ?></option>
+			<?php } ?>
+			</select>
+		</div>
+		
+		<div style="" id="filter-related-wrapper">
+		
+		</div>
+		
+		<input style="margin-left:25px;" type="submit" class="button-secondary" value="<?php echo __('Anzeigen', 'wpsg'); ?>" />
+
 	</div>
 	
-	<input style="float:left; margin-left:25px;" type="submit" class="button-secondary" value="<?php echo __('Anzeigen', 'wpsg'); ?>" />
-	
-	<div class="customfilter" style="display:none;">
-		<?php if (isset($this->view['filter']['day'][0])) { ?>
+	<div class="customfilter" style="display:none; width:100%;">
+				
 		<?php echo wpsg_drawForm_Date('filter[day][0]',  __('von', 'wpsg'), $this->view['filter']['day'][0]['d'].'.'.$this->view['filter']['day'][0]['m'].'.'.$this->view['filter']['day'][0]['Y'], array('time' => false)); ?>
 		<?php echo wpsg_drawForm_Date('filter[day][1]',  __('bis', 'wpsg'), $this->view['filter']['day'][1]['d'].'.'.$this->view['filter']['day'][1]['m'].'.'.$this->view['filter']['day'][1]['Y'], array('time' => false)); ?>
-		<?php } ?>
+			
+		<?php /* if (isset($this->view['filter']['day'][0])) { ?>		
+		
+		<?php } */ ?>
+		
 	</div>
 	
+	<style>
+		
+		.timestamp-wrap { display:flex; flex-direction:row; justify-content:flex-start; align-items:center; }
+		
+	</style>
+	
 	<input type="hidden" id="wpsg_statistics_order" name="filter[order]" value="<?php echo wpsg_hspc($this->view['filter']['order']); ?>" />
 	<input type="hidden" id="wpsg_statistics_sort" name="filter[sort]" value="<?php echo wpsg_hspc($this->view['filter']['sort']); ?>" />
 	
@@ -78,19 +92,22 @@
 	
 		jQuery('#filter-standard').bind('change', function(){
 
-			if (parseInt(jQuery(this).val()) == 11)
-			{
-				jQuery('.customfilter').css('display', 'block');	
+			if (parseInt(jQuery(this).val()) === 11) {
+				
+				jQuery('.customfilter').css('display', 'block');
+				 
 				jQuery('.customfilter .customfilter-input').each(function(index, value) { 
 					jQuery(this).removeAttr('disabled');
-				});		
-			}
-			else
-			{
+				});
+				
+			} else {
+				
 				jQuery('.customfilter').css('display', 'none');	
+				
 				jQuery('.customfilter .customfilter-input').each(function(index, value) { 
 					jQuery(this).attr('disabled', 'disabled');
-				});	
+				});
+				
 			}		
 			
 		});
diff --git a/views/mods/mod_statistics/statistics.phtml b/views/mods/mod_statistics/statistics.phtml
index a5b7580..5883dfe 100644
--- a/views/mods/mod_statistics/statistics.phtml
+++ b/views/mods/mod_statistics/statistics.phtml
@@ -88,54 +88,56 @@
 				</div>
 			</div>
 		</nav>
-	</div>
-
-	<div id="wpsg-bs" >
-		<div class="wpsg_admin_submenu" >
-			
-			<div class="list-group" id="wpsg_statistics_tabs">
-				<span class="list-group-head list-group-item"><?php echo __('Auswahl', 'wpsg'); ?></span>
-			
-			<?php foreach ($this->view['charts'] as $index => $chart) { ?>
+		 
+		<div class="wpsg_msg_wrap"><hr class="wp-header-end wpsg-wp-header-end"/></div>
+		<div class="wpsg_clear"></div>
 	
-				<a class="list-group-item <?php echo ((strtolower($index) == $_REQUEST['id'])?'active':''); ?>" href="admin.php?page=wpsg-Statistics&amp;id=<?php echo wpsg_hspc($index); ?>"><?php echo wpsg_hspc($chart['name']); ?></a>
+		<div style="display:flex; flex-direction:row; justify-content:flex-start; align-items:flex-start;">
 			
-			<?php } ?>
-			</div>
-	
-			<div style="clear:both; margin-bottom:10px; margin-left:0px; margin-right:8px;"></div>
+			<div class="wpsg_admin_submenu">
 				
-		</div>
-	</div>
-	
-	<div style="padding-right:10px; margin-left:210px; float:none;" class="subsubsub">
+				<div class="list-group" id="wpsg_statistics_tabs">
+					<span class="list-group-head list-group-item"><?php echo __('Auswahl', 'wpsg'); ?></span>
+				
+				<?php foreach ($this->view['charts'] as $index => $chart) { ?>
 		
-		<?php 
-			
-			if (wpsg_isSizedString($this->view['chart']['data']['template']))
-			{
-				$templateFile = $this->view['chart']['data']['template'].'.phtml';		
-			}
-			else
-			{
-				$templateFile = str_replace('get', '', strtolower($this->view['standardFilter'][$this->view['filter']['standard']]['func']).'.phtml');
-			}
+					<a class="list-group-item <?php echo ((strtolower($index) == $_REQUEST['id'])?'active':''); ?>" href="admin.php?page=wpsg-Statistics&amp;id=<?php echo wpsg_hspc($index); ?>"><?php echo wpsg_hspc($chart['name']); ?></a>
 				
-			$templatePath = WPSG_PATH_VIEW.'/mods/mod_statistics/'.strtolower($this->view['charts'][$_REQUEST['id']]['func']).'/'.$templateFile;
-			
-			if (is_file($templatePath)) 
-			{ 
-				$this->render($templatePath); 
-			} 
-			else 
-			{ 
+				<?php } ?>
+				</div>
+		 
+			</div> 
+		
+			<div style="padding-left:15px;" class="stat_content">
+				
+				<?php 
+					
+					if (wpsg_isSizedString($this->view['chart']['data']['template']))
+					{
+						$templateFile = $this->view['chart']['data']['template'].'.phtml';		
+					}
+					else
+					{
+						$templateFile = str_replace('get', '', strtolower($this->view['standardFilter'][$this->view['filter']['standard']]['func']).'.phtml');
+					}
+						
+					$templatePath = WPSG_PATH_VIEW.'/mods/mod_statistics/'.strtolower($this->view['charts'][$_REQUEST['id']]['func']).'/'.$templateFile;
+					
+					if (is_file($templatePath)) 
+					{ 
+						$this->render($templatePath); 
+					} 
+					else 
+					{ 
+						
+						wpsg_debug($templatePath);
+						echo '<strong>'.__('Ungültige Anfrage', 'wpsg').'</strong>';
+						 
+					} 
+				?>
 				
-				wpsg_debug($templatePath);
-				echo '<strong>'.__('Ungültige Anfrage', 'wpsg').'</strong>';
-				 
-			} 
-		?>
+			</div>
+			
+		</div>
 		
-	</div>
-	
-	<div style="clear:both; margin-bottom:10px; margin-left:0px; margin-right:8px;"></div>
\ No newline at end of file
+	</div>
\ No newline at end of file
-- 
cgit v1.2.3