Robert Vogel has submitted this change and it was merged.
Change subject: fixes
......................................................................
fixes
* failure now hides loading mask
* fixed bug where multiple months didn't show the right stats
Change-Id: Ice0ae0405bffa53edcbabc9b3eb1426ae053410c
---
M Statistics/includes/DiagramEditsPerUser.class.php
M Statistics/includes/DiagramNumberOfArticles.class.php
M Statistics/includes/DiagramNumberOfEdits.class.php
M Statistics/includes/DiagramNumberOfPages.class.php
M Statistics/includes/DiagramNumberOfUsers.class.php
M Statistics/includes/DiagramSearches.class.php
M Statistics/includes/Interval.class.php
M Statistics/includes/specials/SpecialExtendedStatistics.class.php
M Statistics/resources/BS.Statistics/Filter.js
M Statistics/resources/BS.Statistics/Panel.js
10 files changed, 48 insertions(+), 43 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/Statistics/includes/DiagramEditsPerUser.class.php
b/Statistics/includes/DiagramEditsPerUser.class.php
index 11515db..7b9aec8 100644
--- a/Statistics/includes/DiagramEditsPerUser.class.php
+++ b/Statistics/includes/DiagramEditsPerUser.class.php
@@ -16,7 +16,7 @@
/**
* Describes edits per user for Statistics for BlueSpice.
* @package BlueSpice_Extensions
- * @subpackage Statistics
+ * @subpackage Statistics
*/
class BsDiagramEditsPerUser extends BsDiagram {
@@ -31,7 +31,7 @@
$this->sTitlex = wfMsg( 'bs-statistics-label-time');
$this->sTitley = wfMsg( 'bs-statistics-label-count');
$this->sActualGrain = "m";
- $this->sModLabel = "M";
+ $this->sModLabel = "M y";
$this->sFormatX = "%01.1f";
$this->iDataSource = BsDiagram::DATASOURCE_DATABASE;
$this->bListable = false;
diff --git a/Statistics/includes/DiagramNumberOfArticles.class.php
b/Statistics/includes/DiagramNumberOfArticles.class.php
index 0b34059..ec6c3e3 100644
--- a/Statistics/includes/DiagramNumberOfArticles.class.php
+++ b/Statistics/includes/DiagramNumberOfArticles.class.php
@@ -16,7 +16,7 @@
/**
* Describes number of articles for Statistics for BlueSpice.
* @package BlueSpice_Extensions
- * @subpackage Statistics
+ * @subpackage Statistics
*/
class BsDiagramNumberOfArticles extends BsDiagram {
@@ -31,7 +31,7 @@
$this->sTitlex = wfMsg( 'bs-statistics-label-time');
$this->sTitley = wfMsg( 'bs-statistics-label-count');
$this->sActualGrain = "m";
- $this->sModLabel = "M";
+ $this->sModLabel = "M y";
$this->iDataSource = BsDiagram::DATASOURCE_DATABASE;
$this->bListable = true;
$this->sSqlWhatForDiagram = "count(DISTINCT rev_page)";
diff --git a/Statistics/includes/DiagramNumberOfEdits.class.php
b/Statistics/includes/DiagramNumberOfEdits.class.php
index 69a70f1..6073086 100644
--- a/Statistics/includes/DiagramNumberOfEdits.class.php
+++ b/Statistics/includes/DiagramNumberOfEdits.class.php
@@ -16,7 +16,7 @@
/**
* Describes number of edits for Statistics for BlueSpice.
* @package BlueSpice_Extensions
- * @subpackage Statistics
+ * @subpackage Statistics
*/
class BsDiagramNumberOfEdits extends BsDiagram {
@@ -31,7 +31,7 @@
$this->sTitlex = wfMsg( 'bs-statistics-label-time');
$this->sTitley = wfMsg( 'bs-statistics-label-count');
$this->sActualGrain = "m";
- $this->sModLabel = "M";
+ $this->sModLabel = "M y";
$this->iDataSource = BsDiagram::DATASOURCE_DATABASE;
$this->bListable = false;
$this->sSqlWhatForDiagram = "count(DISTINCT rev_id)";
diff --git a/Statistics/includes/DiagramNumberOfPages.class.php
b/Statistics/includes/DiagramNumberOfPages.class.php
index 03a2350..dcc6255 100644
--- a/Statistics/includes/DiagramNumberOfPages.class.php
+++ b/Statistics/includes/DiagramNumberOfPages.class.php
@@ -16,7 +16,7 @@
/**
* Describes number of pages for Statistics for BlueSpice.
* @package BlueSpice_Extensions
- * @subpackage Statistics
+ * @subpackage Statistics
*/
class BsDiagramNumberOfPages extends BsDiagram {
@@ -31,12 +31,12 @@
$this->sTitlex = wfMsg( 'bs-statistics-label-time');
$this->sTitley = wfMsg( 'bs-statistics-label-count');
$this->sActualGrain = "m";
- $this->sModLabel = "M";
+ $this->sModLabel = "M y";
$this->iDataSource = BsDiagram::DATASOURCE_DATABASE;
$this->bListable = true;
$this->sSqlWhatForDiagram = "count(DISTINCT rev_page)";
$this->sSqlWhatForList = "DISTINCT page_title, rev_user_text";
- $this->sSqlFromWhere = "FROM #__revision AS a
+ $this->sSqlFromWhere = "FROM #__revision AS a
JOIN
#__page ON #__page.page_id = a.rev_page
LEFT
JOIN #__categorylinks AS c ON c.cl_from = a.rev_page
WHERE
rev_timestamp @period
diff --git a/Statistics/includes/DiagramNumberOfUsers.class.php
b/Statistics/includes/DiagramNumberOfUsers.class.php
index c62394b..9b59c82 100644
--- a/Statistics/includes/DiagramNumberOfUsers.class.php
+++ b/Statistics/includes/DiagramNumberOfUsers.class.php
@@ -15,7 +15,7 @@
/**
* Describes number of users diagram for Statistics for BlueSpice.
* @package BlueSpice_Extensions
- * @subpackage Statistics
+ * @subpackage Statistics
*/
class BsDiagramNumberOfUsers extends BsDiagram {
@@ -31,7 +31,7 @@
$this->sTitlex = wfMessage( 'bs-statistics-label-time'
)->plain();
$this->sTitley = wfMessage( 'bs-statistics-label-count'
)->plain();
$this->sActualGrain = "m";
- $this->sModLabel = "M";
+ $this->sModLabel = "M y";
$this->iDataSource = BsDiagram::DATASOURCE_DATABASE;
$this->bListable = true;
$this->sSqlWhatForDiagram = "count(user_id)";
diff --git a/Statistics/includes/DiagramSearches.class.php
b/Statistics/includes/DiagramSearches.class.php
index 0111436..d0cab86 100644
--- a/Statistics/includes/DiagramSearches.class.php
+++ b/Statistics/includes/DiagramSearches.class.php
@@ -16,7 +16,7 @@
/**
* Describes search query diagram for Statistics for BlueSpice.
* @package BlueSpice_Extensions
- * @subpackage Statistics
+ * @subpackage Statistics
*/
class BsDiagramSearches extends BsDiagram {
@@ -31,7 +31,7 @@
$this->sTitlex = wfMsg( 'bs-statistics-label-time');
$this->sTitley = wfMsg( 'bs-statistics-label-count');
$this->sActualGrain = "m";
- $this->sModLabel = "M";
+ $this->sModLabel = "M y";
$this->iDataSource = BsDiagram::DATASOURCE_DATABASE;
$this->bListable = true;
$this->sSqlWhatForDiagram = "count(stats_term)";
diff --git a/Statistics/includes/Interval.class.php
b/Statistics/includes/Interval.class.php
index 30e034a..bc325f7 100644
--- a/Statistics/includes/Interval.class.php
+++ b/Statistics/includes/Interval.class.php
@@ -16,14 +16,14 @@
/**
* Describes an interval for Statistics for BlueSpice.
* @package BlueSpice_Extensions
- * @subpackage Statistics
+ * @subpackage Statistics
*/
class Interval {
/**
* Shortcut for getting a series of Intervals from a diagram
* @param object Diagram $oDiagram
- * @return object Interval
+ * @return object Interval
*/
public static function getIntervalsFromDiagram( $oDiagram ) {
return Interval::getIntervals( $oDiagram->getActualGrain(),
$oDiagram->getStartTime(), $oDiagram->getEndTime(), $oDiagram->getModLabel() );
@@ -35,7 +35,7 @@
* @param string $offset Date string
* @param string $limit Date string
* @param string $modLabel Date format item, e.g. "M" for "Jan, Feb"
- * @return Interval
+ * @return Interval
*/
public static function getIntervals( $step="W", $offset='05/01/2007',
$limit='01/31/2009', $modLabel=false ) {
$intervals=array();
@@ -79,7 +79,7 @@
//var_dump($intervals);
return $intervals;
}
-
+
/**
* Lower interval boundary
* @var string Date string
diff --git a/Statistics/includes/specials/SpecialExtendedStatistics.class.php
b/Statistics/includes/specials/SpecialExtendedStatistics.class.php
index c573408..3c06a67 100644
--- a/Statistics/includes/specials/SpecialExtendedStatistics.class.php
+++ b/Statistics/includes/specials/SpecialExtendedStatistics.class.php
@@ -40,9 +40,9 @@
$sData = $wgRequest->getVal('svg', '');
if( !empty($sData) ) {
switch( $par ) {
- case 'export-png':
+ case 'export-png':
return $this->exportPNG( $sData
);
- case 'export-svg':
+ case 'export-svg':
return $this->exportSVG( $sData
);
}
}
@@ -60,9 +60,9 @@
return true;
}
-
+
/**
- *
+ *
* @global User $wgUser
* @global WebRequest $wgRequest
* @return type
@@ -85,14 +85,14 @@
$sFrom = $wgRequest->getVal('inputFrom', '');
$sMode = $wgRequest->getVal('rgInputDepictionMode',
'');
$sTo = $wgRequest->getVal('inputTo', '');
-
+
$aAvailableDiagrams = Statistics::getAvailableDiagrams();
$aAllowedDiaKeys = array_keys($aAvailableDiagrams);
if( empty($sDiagram) ) $aResult["errors"]['inputDiagrams'] =
wfMessage('bs-statistics-err-emptyinput')->plain();
elseif( !in_array($sDiagram, $aAllowedDiaKeys) )
$aResult["errors"]['inputDiagrams'] =
wfMessage('bs-statistics-err-unknowndia')->plain();
- if( !array_key_exists($sGrain,
BsConfig::get('MW::Statistics::AvailableGrains')) )
+ if( !array_key_exists($sGrain,
BsConfig::get('MW::Statistics::AvailableGrains')) )
$aResult["errors"]['InputDepictionGrain'] =
wfMessage('bs-statistics-err-unknowngrain')->plain();
if( empty($sFrom) ) $aResult["errors"]['inputFrom'] =
wfMessage('bs-statistics-err-emptyinput')->plain();
@@ -108,7 +108,7 @@
if( empty($sMode) ) $aResult["errors"]['rgInputDepictionMode']
= wfMessage('bs-statistics-err-emptyinput')->plain();
elseif( !in_array($sMode, array('absolute', 'aggregated',
'list')) ) $aResult["errors"]['rgInputDepictionMode'] =
wfMessage('bs-statistics-err-unknownmode')->plain();
- elseif( !isset($aResult["errors"]['inputDiagrams']) && $sMode
== 'list' && !$aAvailableDiagrams[$sDiagram]->isListable())
+ elseif( !isset($aResult["errors"]['inputDiagrams']) && $sMode
== 'list' && !$aAvailableDiagrams[$sDiagram]->isListable())
$aResult["errors"]['rgInputDepictionMode'] =
wfMessage('bs-statistics-err-modeunsupported')->plain();
if( !empty($aResult['errors']) ) {
@@ -126,7 +126,7 @@
switch ( $oDiagram->getActualGrain() ) {
// Here, only those grains are listed where label code
differs from grain code.
- case 'm' : $oDiagram->setModLabel( 'M' ); break;
+ case 'm' : $oDiagram->setModLabel( 'M y' ); break;
case 'd' : $oDiagram->setModLabel( 'd.m' ); break;
//default : $oDiagram->modLabel = false;
}
@@ -146,11 +146,11 @@
$oReader->db = $wgDBname;
break;
}
-
+
$intervals = Interval::getIntervalsFromDiagram( $oDiagram );
if( count( $intervals ) > BsConfig::get(
'MW::Statistics::MaxNumberOfIntervals' ) ) {
$aResult['message'] = wfMessage(
'bs-statistics-interval-too-big' )->plain();
- return json_encode($aResult);
+ return json_encode($aResult);
}
//set_time_limit( 60 );
// TODO MRG (20.12.10 00:01): already called before
@@ -231,7 +231,7 @@
intval( $wgRequest->getVal('width', 600) ),
intval( $wgRequest->getVal('height', 400) ),
wfEscapeShellArg(
$sCacheDir.'/'.$sFileName.$sFileExt ),
- wfEscapeShellArg( $sCacheDir )
+ wfEscapeShellArg( $sCacheDir )
),
$wgSVGConverters[$wgSVGConverter]
)." 2>&1";
diff --git a/Statistics/resources/BS.Statistics/Filter.js
b/Statistics/resources/BS.Statistics/Filter.js
index ba83376..2b3b2b6 100644
--- a/Statistics/resources/BS.Statistics/Filter.js
+++ b/Statistics/resources/BS.Statistics/Filter.js
@@ -192,16 +192,16 @@
vertical: false,
allowBlank: false
});
- this.rgInputDepictionMode.add({
+ this.rgInputDepictionMode.add({
boxLabel: mw.message('bs-statistics-absolute').plain(),
labelAlign: 'right',
- name: 'rgInputDepictionMode',
+ name: 'rgInputDepictionMode',
inputValue: 'absolute'
});
- this.rgInputDepictionMode.add({
+ this.rgInputDepictionMode.add({
boxLabel:
mw.message('bs-statistics-aggregated').plain(),
labelAlign: 'right',
- name: 'rgInputDepictionMode',
+ name: 'rgInputDepictionMode',
inputValue: 'aggregated'
});
@@ -251,9 +251,9 @@
this.activateFilterByKeys( record[0].get('filters') );
if( record[0].get('listable') ) {
- this.rgInputDepictionMode.add({
- boxLabel:
mw.message('bs-statistics-list').plain(),
- name: 'rgInputDepictionMode',
+ this.rgInputDepictionMode.add({
+ boxLabel:
mw.message('bs-statistics-list').plain(),
+ name: 'rgInputDepictionMode',
inputValue: 'list'
});
}
@@ -275,14 +275,14 @@
},
removeAdditionalModes: function () {
this.rgInputDepictionMode.removeAll();
- this.rgInputDepictionMode.add({
- boxLabel: mw.message('bs-statistics-absolute').plain(),
- name: 'rgInputDepictionMode',
+ this.rgInputDepictionMode.add({
+ boxLabel: mw.message('bs-statistics-absolute').plain(),
+ name: 'rgInputDepictionMode',
inputValue: 'absolute'
});
- this.rgInputDepictionMode.add({
- boxLabel:
mw.message('bs-statistics-aggregated').plain(),
- name: 'rgInputDepictionMode',
+ this.rgInputDepictionMode.add({
+ boxLabel:
mw.message('bs-statistics-aggregated').plain(),
+ name: 'rgInputDepictionMode',
inputValue: 'aggregated'
});
},
@@ -319,7 +319,8 @@
bs.util.alert( 'STAsuc', { text: action.result.message,
titleMsg: 'bs-extjs-title-success' } );
},
fpFailure: function( form, action ) {
+ this.fireEvent('failed', this, action.result.message,
action.result);
if( action.result.message === undefined ||
action.result.message == '') return;
- bs.util.alert( 'STAfail', { text: action.result.message,
titleMsg: 'bs-extjs-title-success' } );
+ bs.util.alert( 'STAfail', { text: action.result.message,
titleMsg: 'bs-extjs-title-warning' } );
}
});
\ No newline at end of file
diff --git a/Statistics/resources/BS.Statistics/Panel.js
b/Statistics/resources/BS.Statistics/Panel.js
index 8c6897e..4243508 100644
--- a/Statistics/resources/BS.Statistics/Panel.js
+++ b/Statistics/resources/BS.Statistics/Panel.js
@@ -21,6 +21,7 @@
initComponent: function() {
this.pnlFilters = Ext.create('BS.Statistics.Filter');
this.pnlFilters.on('saved', this.onPnlFiltersSaved, this);
+ this.pnlFilters.on('failed', this.onPnlFiltersFailed, this);
this.pnlFilters.on('btnOKBeforeSend',
this.filtersBtnOKBeforeSend, this)
this.crtMain = Ext.create('BS.Statistics.Chart');
@@ -81,7 +82,7 @@
]});
this.items = [
- this.pnlFilters,
+ this.pnlFilters,
this.pnlMain
];
@@ -93,6 +94,9 @@
Ext.baseCSSPrefix + 'mask-loading'
);
},
+ onPnlFiltersFailed: function(sender, message, result) {
+ this.getEl().unmask();
+ },
onPnlFiltersSaved: function(sender, data, result) {
this.getEl().unmask();
//Quickfix: Sometimes label was not set
--
To view, visit https://gerrit.wikimedia.org/r/188031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice0ae0405bffa53edcbabc9b3eb1426ae053410c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Tweichart <[email protected]>
Gerrit-Reviewer: Mglaser <[email protected]>
Gerrit-Reviewer: Pigpen <[email protected]>
Gerrit-Reviewer: Pwirth <[email protected]>
Gerrit-Reviewer: Robert Vogel <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
