sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

partial #1523

Browse Source
This commit is contained in:
Daniel Camargo 2013-07-31 13:01:27 -03:00
parent 1e58c7201b
commit c8a9699850
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/library/Crunchbutton/Chart.php
View File

@ -6,6 +6,7 @@ class Crunchbutton_Chart extends Cana_Model {
public $queryOnlyCommunties = 'AND c.id_community IN (1, 4)';
public $queryExcludeCommunties = "AND c.name != 'Testing' AND c.name IS NOT NULL";
public $queryExcludeUsers = "AND o.name NOT LIKE '%test%' and o.name != 'Judd' and o.name != 'dave' and o.name != 'Nick' and o.name != 'Devin'";
public $minDate = '2012-09-02'; #Issue 1523 - Fist week of September/12
public $from_month;
public $to_month;
@ -179,7 +180,7 @@ class Crunchbutton_Chart extends Cana_Model {
public function allMonths(){
if( !$this->_months ){
$query = "SELECT DISTINCT( DATE_FORMAT( o.date ,'%Y-%m') ) month FROM `order` o WHERE o.date IS NOT NULL ORDER BY month ASC";
$query = "SELECT DISTINCT( DATE_FORMAT( o.date ,'%Y-%m') ) month FROM `order` o WHERE o.date IS NOT NULL AND o.date > '$this->minDate' ORDER BY month ASC";
$results = c::db()->get( $query );
$months = array();
foreach ( $results as $result ) {
@ -212,7 +213,7 @@ class Crunchbutton_Chart extends Cana_Model {
}
public function allDays(){
$query = "SELECT DISTINCT( DATE_FORMAT( o.date ,'%Y-%m-%d') ) day FROM `order` o WHERE o.date IS NOT NULL ORDER BY day ASC";
$query = "SELECT DISTINCT( DATE_FORMAT( o.date ,'%Y-%m-%d') ) day FROM `order` o WHERE o.date IS NOT NULL AND o.date > '$this->minDate' ORDER BY day ASC";
$results = c::db()->get( $query );
$days = array();
foreach ( $results as $result ) {
@ -231,7 +232,7 @@ class Crunchbutton_Chart extends Cana_Model {
public function allWeeks(){
if( !$this->_weeks ){
$query = "SELECT DISTINCT( YEARWEEK( o.date ) ) week FROM `order` o WHERE YEARWEEK( o.date ) IS NOT NULL ORDER BY week ASC";
$query = "SELECT DISTINCT( YEARWEEK( o.date ) ) week FROM `order` o WHERE YEARWEEK( o.date ) IS NOT NULL AND o.date > '$this->minDate' ORDER BY week ASC";
$results = c::db()->get( $query );
$weeks = array();
foreach ( $results as $result ) {

1
include/library/Crunchbutton/Chart/User.php
View File

@ -244,7 +244,6 @@ class Crunchbutton_Chart_User extends Crunchbutton_Chart {
$union = '';
$allMonths = $this->allMonths();
for( $i = $this->from_month -1 ; $i < $this->to_month; $i++ ){
$month = $allMonths[ $i ];
$query .= $union . "SELECT '{$month}' AS Month,

2
include/views/default/cockpit/charts/area.phtml
View File

@ -163,7 +163,7 @@ $(function () {
rotation: -45,
align: 'right'
<?php if( $interval == 'day' ){ ?>,step:10<?php } ?>
<?php if( $interval == 'day' ){ ?>,step:2<?php } ?>
<?php if( $interval == 'week' ){ ?>,step:2<?php } ?>
}
},
yAxis: {