diff --git a/piwik/indico_piwik/controllers.py b/piwik/indico_piwik/controllers.py index eb417f0..ee12a48 100644 --- a/piwik/indico_piwik/controllers.py +++ b/piwik/indico_piwik/controllers.py @@ -20,8 +20,9 @@ from indico.core.config import Config from indico.util.i18n import _ from MaKaC.webinterface.rh.conferenceModif import RHConferenceModifBase -from .views import WPStatistics -from .reports import ReportCountries, ReportDevices, ReportDownloads, ReportGeneral, ReportMaterial, ReportVisitsPerDay +from indico_piwik.views import WPStatistics +from indico_piwik.reports import (ReportCountries, ReportDevices, ReportDownloads, ReportGeneral, ReportMaterial, + ReportVisitsPerDay) class RHStatistics(RHConferenceModifBase): diff --git a/piwik/indico_piwik/plugin.py b/piwik/indico_piwik/plugin.py index 738af57..ff6dc80 100644 --- a/piwik/indico_piwik/plugin.py +++ b/piwik/indico_piwik/plugin.py @@ -25,10 +25,10 @@ from indico.util.i18n import _ from MaKaC.conference import ConferenceHolder, LocalFile from MaKaC.webinterface.wcomponents import SideMenuItem -from .controllers import (RHStatistics, RHApiMaterial, RHApiDownloads, RHApiEventVisitsPerDay, - RHApiEventGraphCountries, RHApiEventGraphDevices) -from .forms import SettingsForm -from .queries.tracking import PiwikQueryTrackDownload +from indico_piwik.controllers import (RHStatistics, RHApiMaterial, RHApiDownloads, RHApiEventVisitsPerDay, + RHApiEventGraphCountries, RHApiEventGraphDevices) +from indico_piwik.forms import SettingsForm +from indico_piwik.queries.tracking import PiwikQueryTrackDownload class PiwikPlugin(IndicoPlugin): diff --git a/piwik/indico_piwik/reports.py b/piwik/indico_piwik/reports.py index 2cd72ca..9cfa989 100644 --- a/piwik/indico_piwik/reports.py +++ b/piwik/indico_piwik/reports.py @@ -23,10 +23,13 @@ from MaKaC.common.cache import GenericCache from MaKaC.common.timezoneUtils import nowutc, utc2server from MaKaC.conference import ConferenceHolder -from .queries.graphs import PiwikQueryReportEventGraphCountries, PiwikQueryReportEventGraphDevices -from .queries.metrics import (PiwikQueryReportEventMetricDownloads, PiwikQueryReportEventMetricPeakDateAndVisitors, - PiwikQueryReportEventMetricReferrers, PiwikQueryReportEventMetricUniqueVisits, - PiwikQueryReportEventMetricVisits, PiwikQueryReportEventMetricVisitDuration) +from indico_piwik.queries.graphs import PiwikQueryReportEventGraphCountries, PiwikQueryReportEventGraphDevices +from indico_piwik.queries.metrics import (PiwikQueryReportEventMetricDownloads, + PiwikQueryReportEventMetricPeakDateAndVisitors, + PiwikQueryReportEventMetricReferrers, + PiwikQueryReportEventMetricUniqueVisits, + PiwikQueryReportEventMetricVisits, + PiwikQueryReportEventMetricVisitDuration) class ReportBase(Serializer):