diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..436d3fe --- /dev/null +++ b/.classpath @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..9c5626c --- /dev/null +++ b/.project @@ -0,0 +1,53 @@ + + + accounting-manager + + + + + + org.eclipse.wst.jsdt.core.javascriptValidator + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.wst.common.project.facet.core.builder + + + + + org.eclipse.wst.validation.validationbuilder + + + + + com.google.gdt.eclipse.core.webAppProjectValidator + + + + + com.google.gwt.eclipse.core.gwtProjectValidator + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jem.workbench.JavaEMFNature + org.eclipse.wst.common.modulecore.ModuleCoreNature + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + org.eclipse.wst.common.project.facet.core.nature + org.eclipse.wst.jsdt.core.jsNature + com.google.gwt.eclipse.core.gwtNature + + diff --git a/.settings/com.google.appengine.eclipse.core.prefs b/.settings/com.google.appengine.eclipse.core.prefs new file mode 100644 index 0000000..82c36af --- /dev/null +++ b/.settings/com.google.appengine.eclipse.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +filesCopiedToWebInfLib= diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs new file mode 100644 index 0000000..4f14ad4 --- /dev/null +++ b/.settings/com.google.gdt.eclipse.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +jarsExcludedFromWebInfLib= +lastWarOutDir=/home/giancarlo/workspace2/accounting-manager/target +warSrcDir= +warSrcDirIsOutput=false diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..29abf99 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,6 @@ +eclipse.preferences.version=1 +encoding//src/main/java=UTF-8 +encoding//src/main/resources=UTF-8 +encoding//src/test/java=UTF-8 +encoding//src/test/resources=UTF-8 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..443e085 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component new file mode 100644 index 0000000..43242c5 --- /dev/null +++ b/.settings/org.eclipse.wst.common.component @@ -0,0 +1,13 @@ + + + + + + + + uses + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml new file mode 100644 index 0000000..cc81385 --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.prefs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 0000000..a7b456a --- /dev/null +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/.settings/org.eclipse.wst.validation.prefs b/.settings/org.eclipse.wst.validation.prefs new file mode 100644 index 0000000..04cad8c --- /dev/null +++ b/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,2 @@ +disabled=06target +eclipse.preferences.version=1 diff --git a/AccountingManager.launch b/AccountingManager.launch new file mode 100644 index 0000000..c6bd412 --- /dev/null +++ b/AccountingManager.launch @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/config/profile.xml b/config/profile.xml new file mode 100644 index 0000000..1302b8c --- /dev/null +++ b/config/profile.xml @@ -0,0 +1,29 @@ + + + + Service + + accounting-manager manages accounting informations + PortletsAdmin + accounting-manager + 0.0.1-SNAPSHOT + + + accounting-manager manages accounting informations + accounting-manager + 0.0.1-SNAPSHOT + + org.gcube.portlets.admin + accounting-manager + 0.0.1-SNAPSHOT + + webapplication + + accounting-manager-0.0.1-SNAPSHOT.war + + + + + + + diff --git a/distro/INSTALL b/distro/INSTALL new file mode 100644 index 0000000..e69de29 diff --git a/distro/LICENSE b/distro/LICENSE new file mode 100644 index 0000000..cc51139 --- /dev/null +++ b/distro/LICENSE @@ -0,0 +1,6 @@ +gCube System - License +------------------------------------------------------------ + +The gCube/gCore software is licensed as Free Open Source software conveying to the EUPL (http://ec.europa.eu/idabc/eupl). +The software and documentation is provided by its authors/distributors "as is" and no expressed or +implied warranty is given for its use, quality or fitness for a particular case. \ No newline at end of file diff --git a/distro/MAINTAINERS b/distro/MAINTAINERS new file mode 100644 index 0000000..0bc9be3 --- /dev/null +++ b/distro/MAINTAINERS @@ -0,0 +1 @@ +Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" diff --git a/distro/README b/distro/README new file mode 100644 index 0000000..2b80e15 --- /dev/null +++ b/distro/README @@ -0,0 +1,48 @@ +The gCube System - accounting-manager +------------------------------------------------------------ + +This work has been supported by the following European projects: iMarine (FP7-INFRASTRUCTURES-2011-2) + +Authors +------- + +Giancarlo Panichi (giancarlo.panichi@isti.cnr.it), CNR Pisa, +Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" + + +Version and Release Date +------------------------ + +v. 0.0.1-SNAPSHOT (2015-04-30) + + +Description +----------- + +accounting-manager manages accounting informations + + +Download information +-------------------- +Source code is available from SVN: + https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/accounting-manager + +Binaries can be downloaded from: + http://software.d4science.research-infrastructures.eu/ + + +Documentation +------------- + +accounting-manager manages accounting informations + +Documentation is available on-line from the Projects Documentation Wiki: + https://gcube.wiki.gcube-system.org/gcube/index.php/Accounting_Manager + + +Licensing +--------- + +This software is licensed under the terms you may find in the file named "LICENSE" in this directory. + + diff --git a/distro/changelog.xml b/distro/changelog.xml new file mode 100644 index 0000000..5c3104c --- /dev/null +++ b/distro/changelog.xml @@ -0,0 +1,5 @@ + + + First Release + + \ No newline at end of file diff --git a/distro/svnpath.txt b/distro/svnpath.txt new file mode 100644 index 0000000..c4c4cfb --- /dev/null +++ b/distro/svnpath.txt @@ -0,0 +1 @@ +https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/accounting-manager \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..78cf530 --- /dev/null +++ b/pom.xml @@ -0,0 +1,441 @@ + + + + + maven-parent + org.gcube.tools + 1.0.0 + + + + + 4.0.0 + org.gcube.portlets.admin + accounting-manager + 0.0.1-SNAPSHOT + war + + + accounting-manager + accounting-manager manages accounting informations + + + https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/admin/accounting-manager + + + + + + Giancarlo Panichi + g.panichi@isti.cnr.it + CNR Pisa, Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" + + architect + developer + + + + + + + ${project.basedir}/distro + ${project.build.directory}/${project.build.finalName} + 2015-04-30 + https://gcube.wiki.gcube-system.org/gcube/index.php/Accounting_Manager + templates + distro + config + + + 2.6.1 + 3.3.2 + 3.1.1 + + + + ${env.KEYS} + + UTF-8 + UTF-8 + + + + + localRun + + + org.slf4j + slf4j-api + compile + + + ch.qos.logback + logback-classic + 1.0.1 + runtime + + + + + + + + + + + com.google.gwt + gwt-user + ${gwtVersion} + + + + com.google.gwt + gwt-servlet + ${gwtVersion} + + + + + + + com.sencha.gxt + gxt + ${gxtVersion} + + + + + + + + + + com.sencha.gxt + gxt-chart + ${gxtVersion} + + + + com.github.highcharts4gwt + highcharts + 0.0.7 + + + + + + + javax.portlet + portlet-api + provided + + + + + + + org.gcube.core + common-scope-maps + + compile + + + + org.gcube.portal + custom-portal-handler + + + + org.gcube.applicationsupportlayer + aslcore + + + + org.gcube.applicationsupportlayer + accesslogger + + + + + + org.gcube.portal + social-networking-library + provided + + + + org.gcube.applicationsupportlayer + aslsocial + provided + + + + + org.gcube.portlets.user + gcube-widgets + + + + + + + + org.gcube.portlets.widgets + session-checker + [0.2.0-SNAPSHOT,1.0.0-SNAPSHOT) + + + + + org.gcube.portlets.admin + accounting-manager-theme + [0.0.1-SNAPSHOT, 2.0.0-SNAPSHOT) + + + + + org.gcube.accounting + accounting-analytics + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + + + + + org.gcube.accounting + accounting-analytics-persistence-couchdb + [1.0.0-SNAPSHOT,2.0.0-SNAPSHOT) + + + + + + com.allen-sauer.gwt.log + gwt-log + ${gwtLogVersion} + + + + org.slf4j + slf4j-api + compile + + + + ch.qos.logback + logback-classic + 1.0.1 + runtime + + + + + + junit + junit + 4.8.1 + test + + + + + + + + ${webappDirectory}/WEB-INF/classes + + + src/main/resources + + **/*.* + + + + + + + + org.codehaus.mojo + gwt-maven-plugin + ${gwtVersion} + + + + -Xmx1024M -Xss1024k -Dgwt.compiler.localWorkers=1 + + + + compile + test + + + + + AccountingManager.html + ${webappDirectory} + org.gcube.portlets.admin.accountingmanager.AccountingManager + + + + + + + org.apache.maven.plugins + maven-war-plugin + 2.1.1 + + + compile + + + + + ${webappDirectory} + ${project.build.finalName} + + + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.16 + + false + + + + org.apache.maven.surefire + surefire-junit47 + 2.16 + + + + + + + + maven-resources-plugin + 2.6 + + + copy-profile + process-resources + + copy-resources + + + ${configDirectory} + + + ${templatesDirectory} + + profile.xml + + true + + + + + + copy-distro-resources + process-resources + + copy-resources + + + ${distroDirectory} + + + ${templatesDirectory} + + profile.xml + descriptor.xml + + true + + + + + + + + + maven-clean-plugin + 2.5 + + + + ${distroDirectory} + + ** + + false + + + ${configDirectory} + + ** + + false + + + + + + + + + org.apache.maven.plugins + maven-assembly-plugin + 2.2 + + + ${templatesDirectory}/descriptor.xml + + ${project.build.finalName} + + + + servicearchive + package + + single + + + + + + + + + + + + + org.gcube.distribution + maven-portal-bom + LATEST + pom + import + + + + + + diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/AccountingManager.gwt.xml b/src/main/java/org/gcube/portlets/admin/accountingmanager/AccountingManager.gwt.xml new file mode 100644 index 0000000..a53d6a3 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/AccountingManager.gwt.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManager.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManager.java new file mode 100644 index 0000000..6435493 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManager.java @@ -0,0 +1,144 @@ +package org.gcube.portlets.admin.accountingmanager.client; + +import org.gcube.portlets.admin.accountingmanager.client.filters.FiltersPanel; +import org.gcube.portlets.admin.accountingmanager.client.maindata.MainDataPanel; +import org.gcube.portlets.admin.accountingmanager.client.menu.AccountingManagerMenu; +import org.gcube.portlets.admin.accountingmanager.client.resource.AccountingManagerResources; +import org.gcube.portlets.admin.accountingmanager.client.rpc.AccountingManagerService; +import org.gcube.portlets.admin.accountingmanager.client.rpc.AccountingManagerServiceAsync; + +import com.allen_sauer.gwt.log.client.Log; +import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.user.client.ui.RootPanel; +import com.sencha.gxt.core.client.util.Margins; +import com.sencha.gxt.widget.core.client.container.BorderLayoutContainer; +import com.sencha.gxt.widget.core.client.container.BorderLayoutContainer.BorderLayoutData; +import com.sencha.gxt.widget.core.client.container.MarginData; +import com.sencha.gxt.widget.core.client.container.Viewport; + +/** + * + * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + */ +public class AccountingManager implements EntryPoint { + + + + private static final String JSP_TAG_ID = "amp"; + + + + @SuppressWarnings("unused") + private final AccountingManagerServiceAsync accountingManagerService = GWT + .create(AccountingManagerService.class); + + // Main Panel + private static BorderLayoutContainer mainPanelLayout; + + + /** + * {@inheritDoc} + */ + public void onModuleLoad() { + + /* + * Install an UncaughtExceptionHandler which will produce + * FATAL log messages + */ + Log.setUncaughtExceptionHandler(); + + // use deferred command to catch initialization exceptions in + // onModuleLoad2 + Scheduler.get().scheduleDeferred(new ScheduledCommand() { + public void execute() { + loadMainPanel(); + } + }); + + } + + protected void loadMainPanel() { + AccountingManagerResources.INSTANCE.accountingManagerCSS().ensureInjected(); + //ScriptInjector.fromString(AccountingManagerResources.INSTANCE.jqueryJs().getText()).setWindow(ScriptInjector.TOP_WINDOW).inject(); + + AccountingManagerController controller = new AccountingManagerController(); + EventBus eventBus = controller.getEventBus(); + + // Layout + mainPanelLayout = new BorderLayoutContainer(); + mainPanelLayout.setId("mainPanelLayout"); + mainPanelLayout.setBorders(false); + mainPanelLayout.getElement().getStyle().setBackgroundColor("rgb(3, 126, 207)"); + + + //Main + MainDataPanel mainDataPanel=new MainDataPanel(eventBus); + MarginData mainData = new MarginData(new Margins(2)); + mainPanelLayout.setCenterWidget(mainDataPanel, mainData); + + //Menu + AccountingManagerMenu accountingManagerMenu=new AccountingManagerMenu(eventBus); + + BorderLayoutData menuData = new BorderLayoutData(58); + menuData.setMargins(new Margins(5)); + menuData.setCollapsible(false); + menuData.setSplit(false); + + mainPanelLayout.setNorthWidget(accountingManagerMenu, menuData); + + //Filters + FiltersPanel filtersPanel=new FiltersPanel(eventBus); + BorderLayoutData westData = new BorderLayoutData(310); + westData.setCollapsible(true); + westData.setSplit(false); + westData.setFloatable(false); + westData.setCollapseMini(true); + westData.setMargins(new Margins(2, 7, 2, 7)); + westData.setCollapseHidden(true); + mainPanelLayout.setWestWidget(filtersPanel, westData); + filtersPanel.expand(); + filtersPanel.enable(); + + bind(mainPanelLayout); + controller.setMainPanelLayout(mainPanelLayout); + controller.restoreUISession(); + } + + protected void bind(BorderLayoutContainer mainWidget) { + try { + RootPanel root = RootPanel.get(JSP_TAG_ID); + Log.info("Root Panel: " + root); + if (root == null) { + Log.info("Div with id " + JSP_TAG_ID + + " not found, starting in dev mode"); + Viewport viewport = new Viewport(); + viewport.setWidget(mainWidget); + viewport.onResize(); + RootPanel.get().add(viewport); + } else { + Log.info("Application div with id " + JSP_TAG_ID + + " found, starting in portal mode"); + PortalViewport viewport = new PortalViewport(); + Log.info("Created Viewport"); + viewport.setEnableScroll(false); + viewport.setWidget(mainWidget); + Log.info("Set Widget"); + Log.info("getOffsetWidth(): " + viewport.getOffsetWidth()); + Log.info("getOffsetHeight(): " + viewport.getOffsetHeight()); + viewport.onResize(); + root.add(viewport); + Log.info("Added viewport to root"); + } + } catch (Exception e) { + e.printStackTrace(); + Log.error("Error in attach viewport:" + e.getLocalizedMessage()); + } + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManagerController.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManagerController.java new file mode 100644 index 0000000..ed31569 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/AccountingManagerController.java @@ -0,0 +1,304 @@ +package org.gcube.portlets.admin.accountingmanager.client; + +import java.util.Date; + +import org.gcube.portlets.admin.accountingmanager.client.event.AccountingMenuEvent; +import org.gcube.portlets.admin.accountingmanager.client.event.FiltersChangeEvent; +import org.gcube.portlets.admin.accountingmanager.client.event.SessionExpiredEvent; +import org.gcube.portlets.admin.accountingmanager.client.event.StateChangeEvent; +import org.gcube.portlets.admin.accountingmanager.client.event.UIStateEvent; +import org.gcube.portlets.admin.accountingmanager.client.monitor.AccountingMonitor; +import org.gcube.portlets.admin.accountingmanager.client.rpc.AccountingManagerServiceAsync; +import org.gcube.portlets.admin.accountingmanager.client.state.AccountingState; +import org.gcube.portlets.admin.accountingmanager.client.state.AccountingStateData; +import org.gcube.portlets.admin.accountingmanager.client.type.SessionExpiredType; +import org.gcube.portlets.admin.accountingmanager.client.type.StateChangeType; +import org.gcube.portlets.admin.accountingmanager.client.type.UIStateType; +import org.gcube.portlets.admin.accountingmanager.client.utils.UtilsGXT3; +import org.gcube.portlets.admin.accountingmanager.shared.Constants; +import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingType; +import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesRequest; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesResponse; +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerSessionExpiredException; +import org.gcube.portlets.admin.accountingmanager.shared.session.UserInfo; +import org.gcube.portlets.widgets.sessionchecker.client.CheckSession; + +import com.allen_sauer.gwt.log.client.Log; +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.event.shared.SimpleEventBus; +import com.google.gwt.i18n.client.LocaleInfo; +import com.google.gwt.user.client.Cookies; +import com.google.gwt.user.client.Timer; +import com.google.gwt.user.client.rpc.AsyncCallback; +import com.sencha.gxt.widget.core.client.container.BorderLayoutContainer; + +/** + * + * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + */ +public class AccountingManagerController { + + private SimpleEventBus eventBus; + private UserInfo userInfo; + private AccountingState accountingState; + private AccountingType accountingType; + @SuppressWarnings("unused") + private BorderLayoutContainer mainPanel; + private AccountingMonitor accountingMonitor; + + public AccountingManagerController() { + eventBus = new SimpleEventBus(); + accountingType = AccountingType.STORAGE; + accountingState = new AccountingState(); + AccountingStateData accountingStateData = new AccountingStateData( + accountingType, null, null); + accountingState.setState(accountingType, accountingStateData); + init(); + } + + private void init() { + callHello(); + checkSession(); + bindToEvents(); + } + + private void checkSession() { + // if you do not need to something when the session expire + CheckSession.getInstance().startPolling(); + } + + private void sessionExpiredShow() { + CheckSession.showLogoutDialog(); + } + + /** + * @return the eventBus + */ + public EventBus getEventBus() { + return eventBus; + } + + public void setMainPanelLayout(BorderLayoutContainer mainPanel) { + this.mainPanel = mainPanel; + } + + private void callHello() { + AccountingManagerServiceAsync.INSTANCE + .hello(new AsyncCallback() { + + @Override + public void onFailure(Throwable caught) { + Log.info("No valid user found: " + caught.getMessage()); + if (caught instanceof AccountingManagerSessionExpiredException) { + UtilsGXT3.alert("Error", "Expired Session"); + sessionExpiredShowDelayed(); + } else { + UtilsGXT3.alert("Error", "No user found"); + } + } + + @Override + public void onSuccess(UserInfo result) { + userInfo = result; + Log.info("Hello: " + userInfo.getUsername()); + + } + + }); + + } + + private void sessionExpiredShowDelayed() { + Timer timeoutTimer = new Timer() { + public void run() { + sessionExpiredShow(); + + } + }; + int TIMEOUT = 3; // 3 second timeout + + timeoutTimer.schedule(TIMEOUT * 1000); // timeout is in milliseconds + + } + + protected void checkLocale() { + String[] locales = LocaleInfo.getAvailableLocaleNames(); + + for (String locale : locales) { + Log.debug("Locale avaible:" + locale); + } + + String currentLocaleCookie = Cookies.getCookie(LocaleInfo + .getLocaleCookieName()); + Log.debug(Constants.AM_LANG_COOKIE + ":" + currentLocaleCookie); + + LocaleInfo currentLocaleInfo = LocaleInfo.getCurrentLocale(); + Log.debug("Current Locale:" + currentLocaleInfo.getLocaleName()); + + } + + protected void changeLanguage(String localeName) { + Date now = new Date(); + long nowLong = now.getTime(); + nowLong = nowLong + (1000 * 60 * 60 * 24 * 21); + now.setTime(nowLong); + String cookieLang = Cookies.getCookie(Constants.AM_LANG_COOKIE); + if (cookieLang != null) { + Cookies.removeCookie(Constants.AM_LANG_COOKIE); + } + Cookies.setCookie(Constants.AM_LANG_COOKIE, localeName, now); + com.google.gwt.user.client.Window.Location.reload(); + } + + // + public void restoreUISession() { + checkLocale(); + + } + + // Bind Controller to events on bus + private void bindToEvents() { + eventBus.addHandler(SessionExpiredEvent.TYPE, + new SessionExpiredEvent.SessionExpiredEventHandler() { + + @Override + public void onSessionExpired(SessionExpiredEvent event) { + Log.debug("Catch Event SessionExpiredEvent"); + doSessionExpiredCommand(event); + + } + }); + + eventBus.addHandler(AccountingMenuEvent.TYPE, + new AccountingMenuEvent.AccountingMenuEventHandler() { + + public void onMenu(AccountingMenuEvent event) { + Log.debug("Catch Event AccountingMenuEvent"); + doMenuCommand(event); + + } + }); + + eventBus.addHandler(FiltersChangeEvent.TYPE, + new FiltersChangeEvent.FiltersChangeEventHandler() { + + public void onFiltersChange(FiltersChangeEvent event) { + Log.debug("Catch Event FiltersChangeEvent"); + doFiltersChangeCommand(event); + + } + }); + + eventBus.fireEvent(new UIStateEvent(UIStateType.START)); + + } + + private void doMenuCommand(AccountingMenuEvent event) { + AccountingStateData accountingStateData = null; + if (event == null || event.getAccountingType() == null) { + return; + } + switch (event.getAccountingType()) { + case PORTLET: + case SERVICE: + case STORAGE: + case TASK: + case JOB: + Log.debug("AccountingType: "+event.getAccountingType()); + accountingType = event.getAccountingType(); + accountingStateData = accountingState.getState(event + .getAccountingType()); + if (accountingStateData == null) { + accountingStateData = new AccountingStateData( + event.getAccountingType(), null, null); + accountingState.setState(event.getAccountingType(), + accountingStateData); + } + StateChangeEvent stateChangeEvent = new StateChangeEvent( + StateChangeType.Restore, accountingStateData); + eventBus.fireEvent(stateChangeEvent); + break; + default: + break; + } + + } + + private void doFiltersChangeCommand(FiltersChangeEvent event) { + if (event == null || event.getFiltersChangeType() == null) { + return; + } + switch (event.getFiltersChangeType()) { + case Update: + SeriesRequest seriesRequest = event.getSeriesRequest(); + AccountingStateData accountingStateData = accountingState + .getState(accountingType); + if (accountingStateData != null) { + accountingMonitor=new AccountingMonitor(); + accountingStateData.setSeriesRequest(seriesRequest); + accountingState.setState(accountingType, accountingStateData); + callSeriesRequest(accountingStateData); + + } + + break; + default: + break; + } + + } + + private void callSeriesRequest(final AccountingStateData accountingStateData) { + + AccountingManagerServiceAsync.INSTANCE.getSeries( + accountingStateData.getAccountingType(), + accountingStateData.getSeriesRequest(), + new AsyncCallback() { + + @Override + public void onSuccess(SeriesResponse seriesResponse) { + Log.debug("SeriesResponse: " + seriesResponse); + accountingStateData.setSeriesResponse(seriesResponse); + accountingState.setState(accountingType, + accountingStateData); + StateChangeEvent stateChangeEvent = new StateChangeEvent( + StateChangeType.Update, accountingStateData); + eventBus.fireEvent(stateChangeEvent); + accountingMonitor.hide(); + } + + @Override + public void onFailure(Throwable caught) { + accountingMonitor.hide(); + if (caught instanceof AccountingManagerSessionExpiredException) { + eventBus.fireEvent(new SessionExpiredEvent( + SessionExpiredType.EXPIREDONSERVER)); + } else { + Log.error("Error:" + caught.getLocalizedMessage()); + UtilsGXT3.alert("Error", + caught.getLocalizedMessage()); + + } + + } + }); + + } + + private void doSessionExpiredCommand(SessionExpiredEvent event) { + Log.debug("Session Expired Event: " + event.getSessionExpiredType()); + sessionExpiredShow(); + + } + + @SuppressWarnings("unused") + private void asyncCodeLoadingFailed(Throwable reason) { + Log.error("Async code loading failed", reason); + eventBus.fireEvent(new SessionExpiredEvent( + SessionExpiredType.EXPIREDONSERVER)); + + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/PortalViewport.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/PortalViewport.java new file mode 100644 index 0000000..6c10491 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/PortalViewport.java @@ -0,0 +1,179 @@ +/** + * + */ +package org.gcube.portlets.admin.accountingmanager.client; + +import com.allen_sauer.gwt.log.client.Log; +import com.google.gwt.core.client.GWT; +import com.google.gwt.dom.client.Element; +import com.google.gwt.safehtml.shared.SafeHtmlBuilder; +import com.google.gwt.user.client.Window; +import com.sencha.gxt.core.client.dom.XDOM; +import com.sencha.gxt.core.client.dom.XElement; +import com.sencha.gxt.widget.core.client.container.SimpleContainer; +import com.sencha.gxt.widget.core.client.container.Viewport.ViewportAppearance; + +/** + * + * @author "Giancarlo Panichi" + * g.panichi@isti.cnr.it + * + */ +public class PortalViewport extends SimpleContainer { + + protected int rightScrollBarSize = 17; + + protected boolean enableScroll; + + + /** + * Creates a viewport layout container with the default appearance. + */ + public PortalViewport() { + this(GWT. create(ViewportAppearance.class)); + } + + /** + * Creates a viewport layout container with the specified appearance. + * + * @param appearance + * the appearance of the viewport layout container + */ + public PortalViewport(ViewportAppearance appearance) { + super(true); + try { + + SafeHtmlBuilder sb = new SafeHtmlBuilder(); + appearance.render(sb); + XElement element=XDOM.create(sb.toSafeHtml()); + setElement((Element)element); + monitorWindowResize = true; + forceLayoutOnResize = true; + getFocusSupport().setIgnore(false); + resize(); + } catch (Exception e) { + Log.error("PortalViewport: constructor error " + + e.getLocalizedMessage()); + } + } + + /** + * Returns true if window scrolling is enabled. + * + * @return true if window scrolling is enabled + */ + public boolean isEnableScroll() { + return enableScroll; + } + + /** + * Sets whether window scrolling is enabled. + * + * @param enableScroll + * true to enable window scrolling + */ + public void setEnableScroll(boolean enableScroll) { + this.enableScroll = enableScroll; + Window.enableScrolling(enableScroll); + } + + /** + * @return the rightScrollBarSize + */ + public int getRightScrollBarSize() { + return rightScrollBarSize; + } + + /** + * @param rightScrollBarSize + * the rightScrollBarSize to set + */ + public void setRightScrollBarSize(int rightScrollBarSize) { + this.rightScrollBarSize = rightScrollBarSize; + } + + @Override + protected void onAttach() { + super.onAttach(); + setEnableScroll(enableScroll); + resize(); + + } + + protected void resize() { + int viewWidth; + if(enableScroll){ + viewWidth= calculateWidth() - rightScrollBarSize; + } else { + viewWidth = calculateWidth(); + } + + int viewHeight = calculateHeight(); + Log.info("AM resize viewWidth: " + viewWidth + " viewHeight: " + + viewHeight + " clientWidth: " + Window.getClientWidth() + + " clientHeight: " + Window.getClientHeight()); + try { + setPixelSize(viewWidth, viewHeight); + } catch (Exception e) { + Log.error("PortalViewport: error in resize() at setPixelSize " + + e.getLocalizedMessage()); + } + } + + /** + * {@inheritDoc} + */ + @Override + protected void onWindowResize(int width, int height) { + int viewWidth = calculateWidth(); + int viewHeight = calculateHeight(); + Log.trace("AM onWindowResize viewWidth: " + viewWidth + + " viewHeight: " + viewHeight + " clientWidth: " + + Window.getClientWidth() + " clientHeight: " + + Window.getClientHeight()); + setPixelSize(viewWidth, viewHeight); + } + + /** + * Update window size + */ + /* + * public void resize(){ + * + * RootPanel workspace = RootPanel.get("tdp"); + * + * int topBorder = workspace.getAbsoluteTop(); + * + * int leftBorder = workspace.getAbsoluteLeft(); + * + * int footer = 85; + * + * int rootHeight = (Window.getClientHeight() - topBorder - 4 - footer);// - + * ((footer == null)?0:(footer.getOffsetHeight()-15)); + * + * if (rootHeight < 550) rootHeight = 550; + * + * int rootWidth = Window.getClientWidth() - 2* leftBorder; //- + * rightScrollBar; + * + * System.out.println("New workspace dimension Height: "+rootHeight+" Width: " + * +rootWidth); + * + * this.setHeight(rootHeight); this.setWidth(rootWidth); } + */ + + protected int calculateWidth() { + int leftBorder = getAbsoluteLeft(); + Log.info("AM width: " + + String.valueOf(Window.getClientWidth() - 2 * leftBorder)); + return Window.getClientWidth() - 2 * leftBorder; + } + + protected int calculateHeight() { + int topBorder = getAbsoluteTop(); + Log.info("AM height: " + + String.valueOf(Window.getClientHeight() - topBorder - 34)); + return Window.getClientHeight() - topBorder - 34; + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/carousel/CarouselPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/carousel/CarouselPanel.java new file mode 100644 index 0000000..8054c3a --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/carousel/CarouselPanel.java @@ -0,0 +1,284 @@ +package org.gcube.portlets.admin.accountingmanager.client.carousel; + +import java.util.ArrayList; + +import org.gcube.portlets.admin.accountingmanager.client.graphics.Vector2D; +import org.gcube.portlets.admin.accountingmanager.client.resource.AccountingManagerResources; + +import com.allen_sauer.gwt.log.client.Log; +import com.google.gwt.event.dom.client.MouseUpEvent; +import com.google.gwt.event.dom.client.MouseUpHandler; +import com.google.gwt.event.dom.client.MouseWheelEvent; +import com.google.gwt.event.dom.client.MouseWheelHandler; +import com.google.gwt.user.client.Event; +import com.google.gwt.user.client.Timer; +import com.sencha.gxt.chart.client.draw.DrawComponent; +import com.sencha.gxt.chart.client.draw.sprite.ImageSprite; +import com.sencha.gxt.chart.client.draw.sprite.Sprite; +import com.sencha.gxt.chart.client.draw.sprite.SpriteOutEvent; +import com.sencha.gxt.chart.client.draw.sprite.SpriteOutEvent.SpriteOutHandler; +import com.sencha.gxt.chart.client.draw.sprite.SpriteOverEvent; +import com.sencha.gxt.chart.client.draw.sprite.SpriteOverEvent.SpriteOverHandler; +import com.sencha.gxt.chart.client.draw.sprite.SpriteSelectionEvent; +import com.sencha.gxt.chart.client.draw.sprite.SpriteSelectionEvent.SpriteSelectionHandler; +import com.sencha.gxt.core.client.util.Margins; +import com.sencha.gxt.widget.core.client.FramedPanel; +import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; +import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData; + +/** + * + * @author giancarlo email: g.panichi@isti.cnr.it + * + */ +public class CarouselPanel extends FramedPanel { + private static final int WIDTH = 1024; + private static final int HEIGHT = 768; + private DrawComponent paint; + private ArrayList sprites; + private Timer mouseTimer; + private Sprite currentSprite; + private Sprite activeSprite; + + private Vector2D startPosition; + private Vector2D currentPosition; + private Vector2D endPosition; + private Vector2D displacement; + + public CarouselPanel() { + init(); + create(); + unmask(); + drawInit(); + } + + private void init() { + setWidth(WIDTH); + setHeight(HEIGHT); + setHeaderVisible(false); + setBodyBorder(false); + setResize(true); + + } + + private void create() { + VerticalLayoutContainer layout = new VerticalLayoutContainer(); + add(layout); + + // Paint + paint = new DrawComponent(); + + paint.setLayoutData(new VerticalLayoutData(1, 1)); + + paint.addSpriteSelectionHandler(new SpriteSelectionHandler() { + + @Override + public void onSpriteSelect(SpriteSelectionEvent event) { + activeSprite(event); + + } + }); + + paint.addSpriteOverHandler(new SpriteOverHandler() { + + @Override + public void onSpriteOver(SpriteOverEvent event) { + spriteOver(event); + + } + }); + + paint.addSpriteOutHandler(new SpriteOutHandler() { + + @Override + public void onSpriteLeave(SpriteOutEvent event) { + spriteLeave(event); + + } + }); + + paint.addDomHandler(new MouseUpHandler() { + + @Override + public void onMouseUp(MouseUpEvent event) { + spriteMouseUp(event); + + } + }, MouseUpEvent.getType()); + + paint.addDomHandler(new MouseWheelHandler() { + + @Override + public void onMouseWheel(MouseWheelEvent event) { + spriteMouseWheel(event); + + } + }, MouseWheelEvent.getType()); + + layout.add(paint, new VerticalLayoutData(1, 1, new Margins(0))); + + } + + protected void drawInit() { + + addSprites(); + + // chartSprite.setX(0); + // chartSprite.setY(0); + + /* + * Log.debug("chartImageResource width:" + chartImageResource.getWidth() + * + " height:" + chartImageResource.getHeight()); fitScale = new + * Vector2D(new Double(DRAW_WIDTH_INT) / chartImageResource.getWidth(), + * new Double(DRAW_HEIGHT_INT) / chartImageResource.getHeight()); + * chartDimension = new Vector2D(chartImageResource.getWidth(), + * chartImageResource.getHeight()); + * + * Log.debug("Offset width:" + DRAW_WIDTH_INT + " height:" + + * DRAW_HEIGHT_INT); Log.debug("Fit Scale: " + fitScale); + * Log.debug("Chart Dimension: " + chartDimension); + * chartSprite.setScaling(new Scaling(fitScale.getX(), + * fitScale.getY())); + * + * chartScale = fitScale.copy(); chartTranslation = new Vector2D(); + */ + paint.redrawSurfaceForced(); + + } + + private void addSprites() { + sprites = new ArrayList(); + sprites.add(new ImageSprite(AccountingManagerResources.INSTANCE + .accountingStorage128())); + + for (ImageSprite sprite : sprites) { + paint.addSprite(sprite); + } + + } + + protected void createMouseTimer() { + mouseTimer = new Timer() { + @Override + public void run() { + // if (activeSprite != null) { + // if (activeSprite == chartSprite) { + // actionOnChartSpriteWhenMouseLeftDown(); + // } + // } + } + }; + + // Schedule the timer to run once in 300 milliseconds. + mouseTimer.scheduleRepeating(200); + Log.debug("MouseTimer Start"); + } + + protected void activeSprite(SpriteSelectionEvent event) { + Event browseEvent = event.getBrowserEvent(); + browseEvent.preventDefault(); + Log.debug("Active Position: " + browseEvent.getClientX() + ", " + + browseEvent.getClientY()); + activeSprite = event.getSprite(); + startPosition = new Vector2D(browseEvent.getClientX(), + browseEvent.getClientY()); + if (activeSprite != null) { + for (ImageSprite sprite : sprites) { + if (activeSprite == sprite) { + /* + * if (activeOperation.compareTo(Operation.ZOOMIN) == 0 || + * activeOperation.compareTo(Operation.ZOOMOUT) == 0) { + * actionOnChartSpriteWhenMouseLeftDown(); + * comboZoomLevel.reset(); comboZoomLevel.redraw(); + * createMouseTimer(); } + */ + break; + } + } + + } + + } + + protected void spriteMouseUp(MouseUpEvent event) { + Log.debug("Deactive Position: " + event.getClientX() + ", " + + event.getClientY()); + endPosition = new Vector2D(event.getClientX(), event.getClientY()); + displacement = startPosition.sub(endPosition); + activeSprite = null; + + if (mouseTimer != null) { + mouseTimer.cancel(); + } + } + + protected void spriteLeave(SpriteOutEvent event) { + Event browseEvent = event.getBrowserEvent(); + Log.debug("Leave Position: " + browseEvent.getClientX() + ", " + + browseEvent.getClientY()); + activeSprite = null; + if (mouseTimer != null) { + mouseTimer.cancel(); + } + } + + protected void spriteOver(SpriteOverEvent event) { + Event browseEvent = event.getBrowserEvent(); + Log.debug("Over Position: " + browseEvent.getClientX() + ", " + + browseEvent.getClientY()); + currentPosition = new Vector2D(browseEvent.getClientX(), + browseEvent.getClientY()); + if (activeSprite != null) { + currentSprite = event.getSprite(); + for (ImageSprite sprite : sprites) { + if (currentSprite == sprite) { + displacement = startPosition.sub(currentPosition); + Log.debug("Chart Sprite Selected"); + actionOnChartSpriteWhenMove(); + break; + } + } + + } else { + + } + + } + + protected void spriteMouseWheel(MouseWheelEvent event) { + int deltaY = event.getDeltaY(); + Log.debug("Wheel: " + deltaY); + /* + * if (deltaY < 0) { zoomIn(); } else { zoomOut(); } + */ + draw(); + + } + + protected void actionOnChartSpriteWhenMove() { + /* + * Log.debug("Operation:" + activeOperation); switch (activeOperation) { + * case ZOOMIN: break; case ZOOMOUT: break; case MOVE: moveChart(); + * break; default: break; } + */ + draw(); + } + + protected void actionOnChartSpriteWhenMouseLeftDown() { + /* + * Log.debug("Operation:" + activeOperation); switch (activeOperation) { + * case MOVE: break; case ZOOMIN: zoomIn(); break; case ZOOMOUT: + * zoomOut(); break; default: break; + * + * } + */ + draw(); + } + + protected void draw() { + + paint.redrawSurfaceForced(); + + } +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/custom/FormatedTimeAxis.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/custom/FormatedTimeAxis.java new file mode 100644 index 0000000..639e6f0 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/custom/FormatedTimeAxis.java @@ -0,0 +1,108 @@ +package org.gcube.portlets.admin.accountingmanager.client.custom; + +import java.util.Date; + +import com.google.gwt.i18n.client.DateTimeFormat; +import com.sencha.gxt.chart.client.chart.axis.CategoryAxis; +import com.sencha.gxt.data.shared.ListStore; +import com.sencha.gxt.data.shared.SortDir; +import com.sencha.gxt.data.shared.Store; +import com.sencha.gxt.data.shared.Store.StoreFilter; +import com.sencha.gxt.data.shared.Store.StoreSortInfo; + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + * @param + */ +public class FormatedTimeAxis extends CategoryAxis { + private Date startDate; + private Date endDate; + private ListStore substore; + private StoreSortInfo sort; + private StoreFilter filter; + private DateTimeFormat dateTimeFormat; + + /** + * Creates a time axis. + */ + public FormatedTimeAxis(DateTimeFormat dateTimeFormat) { + super(); + this.dateTimeFormat = dateTimeFormat; + } + + /** + * Returns the ending date of the axis. + * + * @return the ending date of the axis + */ + public Date getEndDate() { + return endDate; + } + + /** + * Returns the starting date of the axis. + * + * @return the starting date of the axis + */ + public Date getStartDate() { + return startDate; + } + + /** + * Sets the ending date of the axis. + * + * @param endDate + * the ending date of the axis + */ + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + /** + * Sets the starting date of the axis. + * + * @param startDate + * the starting date of the axis + */ + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + @Override + protected void applyData() { + if (sort == null) { + sort = new StoreSortInfo(field, SortDir.ASC); + filter = new StoreFilter() { + @Override + public boolean select(Store store, M parent, M item) { + String stringValue = field.getValue(item); + Date value = dateTimeFormat.parse(stringValue); + boolean result = value.after(startDate) + && value.before(endDate) || value.equals(startDate) + || value.equals(endDate); + return result; + } + }; + } + ListStore store = chart.getStore(); + substore = new ListStore(store.getKeyProvider()); + substore.addSortInfo(sort); + substore.addFilter(filter); + substore.setEnableFilters(true); + substore.addAll(store.getAll()); + chart.setSubstore(substore); + super.applyData(); + } + + @Override + protected void createLabels() { + labelNames.clear(); + for (int i = 0; i < substore.size(); i++) { + labelNames.add(field.getValue(substore.get(i))); + } + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/AccountingMenuEvent.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/AccountingMenuEvent.java new file mode 100644 index 0000000..14c9fe6 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/AccountingMenuEvent.java @@ -0,0 +1,63 @@ +package org.gcube.portlets.admin.accountingmanager.client.event; + +import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingType; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.event.shared.HasHandlers; + +/** + * + * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + */ +public class AccountingMenuEvent extends + GwtEvent { + + public static Type TYPE = new Type(); + private AccountingType accountingType; + + public interface AccountingMenuEventHandler extends EventHandler { + void onMenu(AccountingMenuEvent event); + } + + public interface HasAccountingMenuEventHandler extends HasHandlers { + public HandlerRegistration addAccountingMenuEventHandler( + AccountingMenuEventHandler handler); + } + + public AccountingMenuEvent(AccountingType accountingType) { + this.accountingType = accountingType; + } + + @Override + protected void dispatch(AccountingMenuEventHandler handler) { + handler.onMenu(this); + } + + @Override + public Type getAssociatedType() { + return TYPE; + } + + public static Type getType() { + return TYPE; + } + + public static void fire(HasHandlers source, + AccountingMenuEvent accountingMenuEvent) { + source.fireEvent(accountingMenuEvent); + } + + public AccountingType getAccountingType() { + return accountingType; + } + + @Override + public String toString() { + return "AccountingMenuEvent [accountingType=" + accountingType + "]"; + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/FiltersChangeEvent.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/FiltersChangeEvent.java new file mode 100644 index 0000000..c0a667f --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/FiltersChangeEvent.java @@ -0,0 +1,74 @@ +package org.gcube.portlets.admin.accountingmanager.client.event; + +import org.gcube.portlets.admin.accountingmanager.client.type.FiltersChangeType; +import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesRequest; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.event.shared.HasHandlers; + +/** + * + * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + */ +public class FiltersChangeEvent extends + GwtEvent { + + public static Type TYPE = new Type(); + private FiltersChangeType filtersChangeType; + private SeriesRequest seriesRequest; + + public interface FiltersChangeEventHandler extends EventHandler { + void onFiltersChange(FiltersChangeEvent event); + } + + public interface HasFiltersChangeEventHandler extends HasHandlers { + public HandlerRegistration addFiltersChangeEventHandler( + FiltersChangeEventHandler handler); + } + + public FiltersChangeEvent(FiltersChangeType filtersChangeType, SeriesRequest seriesRequest) { + this.filtersChangeType = filtersChangeType; + this.seriesRequest=seriesRequest; + + } + + @Override + protected void dispatch(FiltersChangeEventHandler handler) { + handler.onFiltersChange(this); + } + + @Override + public Type getAssociatedType() { + return TYPE; + } + + public static Type getType() { + return TYPE; + } + + public static void fire(HasHandlers source, + FiltersChangeEvent filtersChangeEvent) { + source.fireEvent(filtersChangeEvent); + } + + public FiltersChangeType getFiltersChangeType() { + return filtersChangeType; + } + + public SeriesRequest getSeriesRequest() { + return seriesRequest; + } + + @Override + public String toString() { + return "FiltersChangeEvent [filtersChangeType=" + filtersChangeType + + ", seriesRequest=" + seriesRequest + "]"; + } + + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/SessionExpiredEvent.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/SessionExpiredEvent.java new file mode 100644 index 0000000..ebdde90 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/SessionExpiredEvent.java @@ -0,0 +1,64 @@ +package org.gcube.portlets.admin.accountingmanager.client.event; + + +import org.gcube.portlets.admin.accountingmanager.client.type.SessionExpiredType; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.event.shared.HasHandlers; + +/** + * + * @author "Giancarlo Panichi" + * g.panichi@isti.cnr.it + * + */ +public class SessionExpiredEvent extends GwtEvent { + + public static Type TYPE = new Type(); + private SessionExpiredType sessionExpiredType; + + public interface SessionExpiredEventHandler extends EventHandler { + void onSessionExpired(SessionExpiredEvent event); + } + + public interface HasSessionExpiredEventHandler extends HasHandlers{ + public HandlerRegistration addSessionExpiredEventHandler(SessionExpiredEventHandler handler); + } + + public SessionExpiredEvent(SessionExpiredType sessionExpiredType) { + this.sessionExpiredType = sessionExpiredType; + } + + @Override + protected void dispatch(SessionExpiredEventHandler handler) { + handler.onSessionExpired(this); + } + + @Override + public Type getAssociatedType() { + return TYPE; + } + + public static Type getType() { + return TYPE; + } + + public static void fire(HasHandlers source, SessionExpiredType sessionExpiredType) { + source.fireEvent(new SessionExpiredEvent(sessionExpiredType)); + } + + public SessionExpiredType getSessionExpiredType() { + return sessionExpiredType; + } + + @Override + public String toString() { + return "SessionExpiredEvent [sessionExpiredType=" + sessionExpiredType + + "]"; + } + + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/StateChangeEvent.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/StateChangeEvent.java new file mode 100644 index 0000000..053423a --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/StateChangeEvent.java @@ -0,0 +1,74 @@ +package org.gcube.portlets.admin.accountingmanager.client.event; + +import org.gcube.portlets.admin.accountingmanager.client.state.AccountingStateData; +import org.gcube.portlets.admin.accountingmanager.client.type.StateChangeType; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.event.shared.HasHandlers; + +/** + * + * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + */ +public class StateChangeEvent extends + GwtEvent { + + public static Type TYPE = new Type(); + private StateChangeType stateChangeType; + private AccountingStateData accountingStateData; + + public interface StateChangeEventHandler extends EventHandler { + void onStateChange(StateChangeEvent event); + } + + public interface HasStateChangeEventHandler extends HasHandlers { + public HandlerRegistration addStateChangeEventHandler( + StateChangeEventHandler handler); + } + + public StateChangeEvent(StateChangeType stateChangeType, + AccountingStateData accountingStateData) { + this.stateChangeType = stateChangeType; + this.accountingStateData = accountingStateData; + } + + @Override + protected void dispatch(StateChangeEventHandler handler) { + handler.onStateChange(this); + } + + @Override + public Type getAssociatedType() { + return TYPE; + } + + public static Type getType() { + return TYPE; + } + + public static void fire(HasHandlers source, + StateChangeEvent stateChangeEvent) { + source.fireEvent(stateChangeEvent); + } + + public StateChangeType getStateChangeType() { + return stateChangeType; + } + + public AccountingStateData getAccountingStateData() { + return accountingStateData; + } + + @Override + public String toString() { + return "StateChangeEvent [stateChangeType=" + stateChangeType + + ", accountingStateData=" + accountingStateData + "]"; + } + + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/UIStateEvent.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/UIStateEvent.java new file mode 100644 index 0000000..4c1d033 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/event/UIStateEvent.java @@ -0,0 +1,67 @@ +package org.gcube.portlets.admin.accountingmanager.client.event; + + +import org.gcube.portlets.admin.accountingmanager.client.type.UIStateType; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.event.shared.HasHandlers; + +/** + * + * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + */ +public class UIStateEvent extends GwtEvent { + + public static Type TYPE = new Type(); + private UIStateType uiStateType; + + public interface UIStateHandler extends EventHandler { + void onUIState(UIStateEvent event); + } + + public interface HasUIStateHandler extends HasHandlers { + public HandlerRegistration addUIStateHandler(UIStateHandler handler); + } + + public UIStateEvent(UIStateType uiStateType) { + this.uiStateType = uiStateType; + } + + + @Override + protected void dispatch(UIStateHandler handler) { + handler.onUIState(this); + } + + @Override + public Type getAssociatedType() { + return TYPE; + } + + public static Type getType() { + return TYPE; + } + + public static void fire(HasHandlers source, UIStateEvent uiStateEvent) { + source.fireEvent(uiStateEvent); + } + + + public UIStateType getUiStateType() { + return uiStateType; + } + + + @Override + public String toString() { + return "UIStateEvent [uiStateType=" + uiStateType + "]"; + } + + + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/AccountingPeriodPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/AccountingPeriodPanel.java new file mode 100644 index 0000000..b7c4d0a --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/AccountingPeriodPanel.java @@ -0,0 +1,243 @@ +package org.gcube.portlets.admin.accountingmanager.client.filters; + +import java.util.Date; + +import org.gcube.portlets.admin.accountingmanager.client.event.StateChangeEvent; +import org.gcube.portlets.admin.accountingmanager.client.properties.AccountingPeriodModePropertiesCombo; +import org.gcube.portlets.admin.accountingmanager.client.utils.UtilsGXT3; +import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingPeriod; +import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingPeriodMode; + +import com.allen_sauer.gwt.log.client.Log; +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.logical.shared.SelectionEvent; +import com.google.gwt.event.logical.shared.SelectionHandler; +import com.google.gwt.event.logical.shared.ValueChangeEvent; +import com.google.gwt.event.logical.shared.ValueChangeHandler; +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.i18n.client.DateTimeFormat; +import com.google.gwt.i18n.client.DateTimeFormat.PredefinedFormat; +import com.sencha.gxt.cell.core.client.form.ComboBoxCell.TriggerAction; +import com.sencha.gxt.core.client.util.Margins; +import com.sencha.gxt.data.shared.LabelProvider; +import com.sencha.gxt.data.shared.ListStore; +import com.sencha.gxt.widget.core.client.container.MarginData; +import com.sencha.gxt.widget.core.client.container.SimpleContainer; +import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; +import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData; +import com.sencha.gxt.widget.core.client.event.ParseErrorEvent; +import com.sencha.gxt.widget.core.client.form.ComboBox; +import com.sencha.gxt.widget.core.client.form.DateField; +import com.sencha.gxt.widget.core.client.form.FieldLabel; +import com.sencha.gxt.widget.core.client.form.FieldSet; +import com.sencha.gxt.widget.core.client.form.validator.EmptyValidator; +import com.sencha.gxt.widget.core.client.form.validator.MaxDateValidator; +import com.sencha.gxt.widget.core.client.info.Info; + +/** + * + * @author giancarlo email: g.panichi@isti.cnr.it + * + */ +public class AccountingPeriodPanel extends SimpleContainer { + + private EventBus eventBus; + private DateField startDate; + private DateField endDate; + private ListStore storeCombo; + private ComboBox comboPeriodMode; + + public AccountingPeriodPanel(EventBus eventBus) { + super(); + Log.debug("AccountingPeriodPanel"); + this.eventBus = eventBus; + init(); + create(); + bindToEvents(); + + } + + private void init() { + + } + + private void create() { + startDate = new DateField(); + startDate.addValidator(new MaxDateValidator(new Date())); + startDate.addValidator(new EmptyValidator()); + startDate.addParseErrorHandler(new ParseErrorEvent.ParseErrorHandler() { + + @Override + public void onParseError(ParseErrorEvent event) { + Info.display("Parse Error", event.getErrorValue() + + " could not be parsed as a date"); + + } + }); + startDate.addValueChangeHandler(new ValueChangeHandler() { + @Override + public void onValueChange(ValueChangeEvent event) { + String v = event.getValue() == null ? "Nothing" + : DateTimeFormat.getFormat(PredefinedFormat.DATE_SHORT) + .format(event.getValue()); + Info.display("Start Date Selected", v); + } + }); + + FieldLabel startDateLabel = new FieldLabel(startDate, "Start Date"); + + endDate = new DateField(); + endDate.addValidator(new MaxDateValidator(new Date())); + endDate.addValidator(new EmptyValidator()); + + endDate.addParseErrorHandler(new ParseErrorEvent.ParseErrorHandler() { + @Override + public void onParseError(ParseErrorEvent event) { + Info.display("Parse Error", event.getErrorValue() + + " could not be parsed as a date"); + } + }); + endDate.addValueChangeHandler(new ValueChangeHandler() { + @Override + public void onValueChange(ValueChangeEvent event) { + String v = event.getValue() == null ? "Nothing" + : DateTimeFormat.getFormat(PredefinedFormat.DATE_SHORT) + .format(event.getValue()); + Info.display("End Date Selected", v); + } + }); + + FieldLabel endDateLabel = new FieldLabel(endDate, "End Date"); + + // Aggreagation Mode + AccountingPeriodModePropertiesCombo props = GWT + .create(AccountingPeriodModePropertiesCombo.class); + storeCombo = new ListStore(props.id()); + storeCombo.addAll(AccountingPeriodMode.asList()); + + comboPeriodMode = new ComboBox(storeCombo, + props.label()); + comboPeriodMode.setMinListWidth(250); + comboPeriodMode.setEditable(false); + comboPeriodMode.setTypeAhead(false); + comboPeriodMode.setAllowBlank(false); + comboPeriodMode.setTriggerAction(TriggerAction.ALL); + comboPeriodMode.setValue(AccountingPeriodMode.DAILY); + addHandlersForComboPeriodMode(props.label()); + + Log.debug("ComboPeriodMode created"); + + FieldLabel periodModeLabel = new FieldLabel(comboPeriodMode, + "Aggregation"); + + VerticalLayoutContainer vlc = new VerticalLayoutContainer(); + vlc.add(startDateLabel, new VerticalLayoutData(1, -1, new Margins(0))); + vlc.add(endDateLabel, new VerticalLayoutData(1, -1, new Margins(0))); + vlc.add(periodModeLabel, new VerticalLayoutData(1, -1, new Margins(0))); + + FieldSet fieldSet = new FieldSet(); + fieldSet.setHeadingHtml("Temporal Constraint"); + fieldSet.setCollapsible(false); + fieldSet.add(vlc); + + add(fieldSet, new MarginData(0)); + + } + + // Bind to Events + private void bindToEvents() { + eventBus.addHandler(StateChangeEvent.TYPE, + new StateChangeEvent.StateChangeEventHandler() { + + @Override + public void onStateChange(StateChangeEvent event) { + Log.debug("Catch Event State Change"); + doStateChangeCommand(event); + + } + }); + } + + + private void addHandlersForComboPeriodMode( + final LabelProvider labelProvider) { + comboPeriodMode.addSelectionHandler(new SelectionHandler() { + public void onSelection(SelectionEvent event) { + Info.display( + "Aggregation", + "You selected " + + (event.getSelectedItem() == null ? "nothing" + : labelProvider.getLabel(event + .getSelectedItem()) + "!")); + Log.debug("ComboPeriodMode selected: " + event.getSelectedItem()); + + } + + }); + } + + private void doStateChangeCommand(StateChangeEvent event) { + if (event.getStateChangeType() == null) { + return; + } + switch (event.getStateChangeType()) { + case Restore: + onRestoreStateChange(event); + break; + case Update: + break; + default: + break; + + } + + } + + private void onRestoreStateChange(StateChangeEvent event) { + if (event.getAccountingStateData()!=null&&event.getAccountingStateData().getSeriesRequest() != null + && event.getAccountingStateData().getSeriesRequest().getAccountingPeriod() != null) { + AccountingPeriod accountingPeriod = event.getAccountingStateData().getSeriesRequest() + .getAccountingPeriod(); + startDate.setValue(accountingPeriod.getStartDate()); + endDate.setValue(accountingPeriod.getEndDate()); + comboPeriodMode.setValue(accountingPeriod.getPeriod()); + } else { + startDate.reset(); + endDate.reset(); + comboPeriodMode.reset(); + comboPeriodMode.setValue(AccountingPeriodMode.DAILY); + } + + forceLayout(); + } + + public AccountingPeriod getAccountingPeriod() { + if (startDate.validate() && endDate.validate()) { + Date startD = startDate.getCurrentValue(); + Date endD = endDate.getCurrentValue(); + if (startD.compareTo(endD) <= 0) { + if (comboPeriodMode.validate() + && comboPeriodMode.getCurrentValue() != null) { + AccountingPeriod accountingPeriod = new AccountingPeriod( + startD, endD, comboPeriodMode.getCurrentValue()); + return accountingPeriod; + } else { + UtilsGXT3.alert("Attention", + "Select a valid aggregation mode!"); + return null; + } + } else { + UtilsGXT3 + .alert("Attention", + "The start date must be less than or equal to the end date!"); + return null; + } + + } else { + return null; + } + + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/FiltersPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/FiltersPanel.java new file mode 100644 index 0000000..69ce1ed --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/filters/FiltersPanel.java @@ -0,0 +1,95 @@ +package org.gcube.portlets.admin.accountingmanager.client.filters; + +import org.gcube.portlets.admin.accountingmanager.client.event.FiltersChangeEvent; +import org.gcube.portlets.admin.accountingmanager.client.resource.AccountingManagerResources; +import org.gcube.portlets.admin.accountingmanager.client.type.FiltersChangeType; +import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingPeriod; +import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesRequest; + +import com.allen_sauer.gwt.log.client.Log; +import com.google.gwt.event.shared.EventBus; +import com.sencha.gxt.cell.core.client.ButtonCell.IconAlign; +import com.sencha.gxt.core.client.dom.ScrollSupport.ScrollMode; +import com.sencha.gxt.core.client.util.Margins; +import com.sencha.gxt.widget.core.client.FramedPanel; +import com.sencha.gxt.widget.core.client.button.TextButton; +import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutData; +import com.sencha.gxt.widget.core.client.container.BoxLayoutContainer.BoxLayoutPack; +import com.sencha.gxt.widget.core.client.container.HBoxLayoutContainer; +import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer; +import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.VerticalLayoutData; +import com.sencha.gxt.widget.core.client.event.SelectEvent; +import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; + +/** + * + * @author giancarlo email: g.panichi@isti.cnr.it + * + */ +public class FiltersPanel extends FramedPanel { + private EventBus eventBus; + private AccountingPeriodPanel accountPeriodPanel; + private TextButton updateCharts; + + public FiltersPanel(EventBus eventBus) { + super(); + Log.debug("FiltersPanel"); + this.eventBus = eventBus; + // msgs = GWT.create(ServiceCategoryMessages.class); + init(); + create(); + + } + + protected void init() { + forceLayoutOnResize = true; + setBodyBorder(false); + setBorders(false); + setHeaderVisible(false); + + } + + protected void create() { + accountPeriodPanel = new AccountingPeriodPanel(eventBus); + + updateCharts = new TextButton("Update Chart"); + updateCharts.setIcon(AccountingManagerResources.INSTANCE + .accountingReload24()); + updateCharts.setIconAlign(IconAlign.RIGHT); + updateCharts.setToolTip("Update Chart"); + + updateCharts.addSelectHandler(new SelectHandler() { + + public void onSelect(SelectEvent event) { + updateChart(); + + } + }); + + HBoxLayoutContainer hBox = new HBoxLayoutContainer(); + hBox.setPack(BoxLayoutPack.START); + hBox.add(updateCharts, new BoxLayoutData(new Margins(2, 5, 2, 5))); + + VerticalLayoutContainer vlc = new VerticalLayoutContainer(); + vlc.setScrollMode(ScrollMode.AUTO); + vlc.add(accountPeriodPanel, new VerticalLayoutData(1, -1, new Margins( + 4, 0, 2, 4))); + vlc.add(hBox, new VerticalLayoutData(1, -1, new Margins(0))); + + add(vlc); + } + + protected void updateChart() { + AccountingPeriod accountingPeriod = accountPeriodPanel + .getAccountingPeriod(); + if (accountingPeriod != null) { + SeriesRequest seriesRequest = new SeriesRequest(accountingPeriod); + FiltersChangeEvent filtersChangeEvent = new FiltersChangeEvent( + FiltersChangeType.Update, seriesRequest); + eventBus.fireEvent(filtersChangeEvent); + } + + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/graphics/Vector2D.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/graphics/Vector2D.java new file mode 100644 index 0000000..4f0f4f4 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/graphics/Vector2D.java @@ -0,0 +1,180 @@ +package org.gcube.portlets.admin.accountingmanager.client.graphics; + +/** + * + * Basic Vector 2D + * + * @author giancarlo email: g.panichi@isti.cnr.it + * + */ +public class Vector2D { + + public static Vector2D Vector2DNull = new Vector2D(0, 0); + + protected double x; + protected double y; + + public Vector2D() { + x = y = 0.0; + } + + public Vector2D(double x, double y) { + this.x = x; + this.y = y; + } + + public double getX() { + return x; + } + + public void setX(double x) { + this.x = x; + } + + public double getY() { + return y; + } + + public void setY(double y) { + this.y = y; + } + + // Compute magnitude of vector .... + public double length() { + return Math.sqrt(x * x + y * y); + } + + // Sum of two vectors .... + public Vector2D add(Vector2D v) { + Vector2D v1 = new Vector2D(this.x + v.x, this.y + v.y); + return v1; + } + + // Add scalar + public Vector2D add(double s) { + Vector2D v1 = new Vector2D(this.x + s, this.y + s); + return v1; + } + + // Subtract vector v1 from v ..... + public Vector2D sub(Vector2D v) { + Vector2D v1 = new Vector2D(this.x - v.x, this.y - v.y); + return v1; + } + + // Subtract scalar + public Vector2D sub(double s) { + Vector2D v2 = new Vector2D(this.x - s, this.y - s); + return v2; + } + + // Scale vector by a constant ... + public Vector2D scale(double scaleFactor) { + Vector2D v2 = new Vector2D(this.x * scaleFactor, this.y * scaleFactor); + return v2; + } + + // Normalize a vectors length.... + public Vector2D normalize() { + Vector2D v2 = new Vector2D(); + + double length = Math.sqrt(this.x * this.x + this.y * this.y); + if (length != 0) { + v2.x = this.x / length; + v2.y = this.y / length; + } + + return v2; + } + + // Dot product of two vectors ..... + public double dot(Vector2D v) { + return this.x * v.x + this.y * v.y; + } + + // Multiply + public Vector2D multiply(Vector2D v) { + Vector2D v1 = new Vector2D(this.x * v.getX(), this.y * v.getY()); + return v1; + } + + public Vector2D multiply(double s) { + Vector2D v1 = new Vector2D(this.x * s, this.y * s); + return v1; + } + + // Divide + public Vector2D divide(Vector2D v) { + Vector2D v1 = new Vector2D(this.x / v.getX(), this.y / v.getY()); + return v1; + } + + public Vector2D divide(double s) { + if (s != 0) { + Vector2D v1 = new Vector2D(this.x / s, this.y / s); + return v1; + } else { + return Vector2DNull; + } + + } + + // Distance To Squared + public double distanceToSquared(Vector2D v) { + double dx = this.x - v.x, dy = this.y - v.y; + return dx * dx + dy * dy; + + } + + // Distance + public double distance(Vector2D v) { + return Math.sqrt(this.distanceToSquared(v)); + } + + // Negate + public Vector2D negate() { + Vector2D v1 = new Vector2D(-x, -y); + return v1; + } + + public boolean equals(Vector2D v) { + return v.getX() == x && v.getY() == y; + } + + public Vector2D copy() { + return new Vector2D(x, y); + } + + // Floor + public Vector2D floor() { + Vector2D v1 = new Vector2D(Math.floor(this.x), Math.floor(this.y)); + return v1; + } + + // Ceil + public Vector2D ceil() { + Vector2D v1 = new Vector2D(Math.ceil(this.x), Math.ceil(this.y)); + return v1; + } + + // Round + public Vector2D round() { + Vector2D v1 = new Vector2D(Math.round(this.x), Math.round(this.y)); + return v1; + } + + // Round To Zero + public Vector2D roundToZero() { + double dx=x<0?Math.ceil( this.x ):Math.floor( this.x ); + double dy=y<0?Math.ceil( this.y ):Math.floor( this.y ); + Vector2D v1 = new Vector2D(dx,dy); + return v1; + } + + @Override + public String toString() { + return "Vector2D [x=" + x + ", y=" + y + "]"; + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/HightChartPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/HightChartPanel.java new file mode 100644 index 0000000..117da40 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/HightChartPanel.java @@ -0,0 +1,981 @@ +package org.gcube.portlets.admin.accountingmanager.client.maindata; + +import java.util.Date; + +import org.gcube.portlets.admin.accountingmanager.client.event.StateChangeEvent; +import org.gcube.portlets.admin.accountingmanager.client.state.AccountingStateData; +import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingPeriod; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesJob; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesPortlet; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesService; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesServiceData; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesStorage; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesStorageData; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesTask; + +import com.allen_sauer.gwt.log.client.Log; +import com.github.highcharts4gwt.client.view.widget.HighchartsLayoutPanel; +import com.github.highcharts4gwt.model.array.api.ArrayNumber; +import com.github.highcharts4gwt.model.array.api.ArrayString; +import com.github.highcharts4gwt.model.factory.api.HighchartsOptionFactory; +import com.github.highcharts4gwt.model.factory.jso.JsoHighchartsOptionFactory; +import com.github.highcharts4gwt.model.highcharts.option.api.ChartOptions; +import com.github.highcharts4gwt.model.highcharts.option.api.SeriesArea; +import com.github.highcharts4gwt.model.highcharts.option.api.SeriesColumn; +import com.google.gwt.event.shared.EventBus; +import com.sencha.gxt.widget.core.client.FramedPanel; + +/** + * + * @author giancarlo email: g.panichi@isti.cnr.it + * + */ +public class HightChartPanel extends FramedPanel { + + private EventBus eventBus; + + public HightChartPanel(EventBus eventBus) { + super(); + this.eventBus = eventBus; + // msgs = GWT.create(ServiceCategoryMessages.class); + init(); + create(); + bindToEvents(); + } + + protected void init() { + forceLayoutOnResize = true; + setBodyBorder(false); + setBorders(false); + setHeaderVisible(false); + setResize(true); + + } + + + + private void create() { + + } + + + // Bind to Events + private void bindToEvents() { + eventBus.addHandler(StateChangeEvent.TYPE, + new StateChangeEvent.StateChangeEventHandler() { + + @Override + public void onStateChange(StateChangeEvent event) { + Log.debug("Catch Event State Change"); + doStateChangeCommand(event); + + } + }); + } + + private void doStateChangeCommand(StateChangeEvent event) { + if (event.getStateChangeType() == null) { + return; + } + switch (event.getStateChangeType()) { + case Restore: + case Update: + onStateChange(event); + + break; + default: + break; + + } + + } + + private void onStateChange(StateChangeEvent event) { + if (event.getAccountingStateData() == null + || event.getAccountingStateData().getAccountingType() == null) { + return; + } + + switch (event.getAccountingStateData().getAccountingType()) { + case JOB: + createJobChart(event.getAccountingStateData()); + break; + case PORTLET: + createPortletChart(event.getAccountingStateData()); + break; + case SERVICE: + createServiceChart(event.getAccountingStateData()); + break; + case STORAGE: + createStorageChart(event.getAccountingStateData()); + break; + case TASK: + createTaskChart(event.getAccountingStateData()); + break; + default: + break; + } + + } + + private double calculateMinRange(AccountingPeriod accountingPeriod) { + if (accountingPeriod.getPeriod() == null) { + Log.error("AccountingPeriodMode is null"); + return 0; + } + + switch (accountingPeriod.getPeriod()) { + case DAILY: + // 1 day=24hour * 60min *60sec * 1000 millisec + return 14 * 24 * 3600 * 1000; + case HOURLY: + return 24 * 3600 * 1000; + case MILLISECONDLY: + return 10 * 100; + case MINUTELY: + return 10 * 60 * 1000; + case MONTHLY: + return 6 * 28 * 24 * 3600 * 1000; + case SECONDLY: + return 30 * 1000; + case YEARLY: + return 5 * 12 * 28 * 24 * 3600 * 1000; + + default: + return 0; + } + + } + + private double calculateInterval(AccountingPeriod accountingPeriod) { + if (accountingPeriod.getPeriod() == null) { + Log.error("AccountingPeriodMode is null"); + return 0; + } + + switch (accountingPeriod.getPeriod()) { + case DAILY: + return 24 * 3600 * 1000; + case HOURLY: + return 3600 * 1000; + case MILLISECONDLY: + return 100; + case MINUTELY: + return 60 * 1000; + case MONTHLY: + return 28 * 24 * 3600 * 1000; + case SECONDLY: + return 1000; + case YEARLY: + return 12 * 28 * 24 * 3600 * 1000; + + default: + return 0; + } + + } + + private void createStorageChart(AccountingStateData accountingStateData) { + clear(); + if (accountingStateData == null + || accountingStateData.getAccountingType() == null + || accountingStateData.getSeriesRequest() == null + || accountingStateData.getSeriesResponse() == null) { + forceLayout(); + return; + } + + if(!(accountingStateData + .getSeriesResponse() instanceof SeriesStorage)){ + forceLayout(); + return; + } + + + SeriesStorage seriesStorage = (SeriesStorage) accountingStateData + .getSeriesResponse(); + + double minRange = calculateMinRange(accountingStateData + .getSeriesRequest().getAccountingPeriod()); + + double interval=calculateInterval(accountingStateData + .getSeriesRequest().getAccountingPeriod()); + + Date dateStart=accountingStateData.getSeriesRequest().getAccountingPeriod().getStartDate(); + + HighchartsOptionFactory highchartsFactory = new JsoHighchartsOptionFactory(); + ChartOptions options = highchartsFactory.createChartOptions(); + options.chart().zoomType("x"); + + options.title().text("Accounting Storage"); + + options.subtitle().text("Click and drag in the plot area to zoom in"); + + ArrayString colors = options.colors(); + // colors.setValue(0, "#cc0038"); + // colors.setValue(1, "#32cd32"); + + + // xAxis + options.xAxis().type("datetime").minRange(minRange); + + // yAxis + // options.yAxis().title().text("Exchange rate"); + // Highcharts.getOptions().colors[0] + String multiAxis = "[{" + " \"id\": \"OperationCount\"," + + " \"labels\": { " + " \"format\": \"{value}\"," + + " \"style\": { " + " \"color\": \"" + + colors.get(1) + + "\"" + + " }" + + " }," + + " \"title\": { " + + " \"text\": \"Operation Count\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(1) + + "\"" + + " }" + + " }" + + "} , {" + + " \"id\": \"DataVolume\", " + + " \"title\": {" + + " \"text\": \"Data Volume\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(0) + + "\"" + + " }" + + " }," + + " \"labels\": {" + + " \"format\": \"{value} kB\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(0) + + "\"" + + " }" + + " }," + " \"opposite\": \"true\"" + "}]"; + + options.setFieldAsJsonObject("yAxis", multiAxis); + + // TODO does not seem to be working + String fillcolor = "{" + "\"linearGradient\": {" + "\"x1\": 0," + + "\"y1\": 0," + "\"x2\": 0," + "\"y2\": 1" + "}," + + "\"stops\": [" + "[" + "0, \"#058DC7\"" + "]," + "[" + + "1, \"#FFFFFF\"" + "]" + "]" + "}"; + + options.plotOptions().area() + .setFieldAsJsonObject("fillColor", fillcolor).marker() + .radius(2).lineWidth(1).states().hover().lineWidth(1); + + + + SeriesColumn seriesOperationCount = highchartsFactory.createSeriesColumn(); + seriesOperationCount.name("Operation Count"); + seriesOperationCount.color(colors.get(1)); + seriesOperationCount.type("column"); + + ArrayNumber dataOperationCount = seriesOperationCount + .dataAsArrayNumber(); + + seriesOperationCount.pointInterval(interval).pointStart(dateStart.getTime()); + + SeriesArea seriesDataVolume = highchartsFactory.createSeriesArea(); + seriesDataVolume.name("Data Volume"); + seriesDataVolume.color(colors.get(0)); + seriesDataVolume.yAxisAsString("DataVolume"); + + + ArrayNumber dataDataVolume = seriesDataVolume.dataAsArrayNumber(); + + + seriesDataVolume.pointInterval(interval).pointStart( + dateStart.getTime()); + + + for (SeriesStorageData seriesStorageData : seriesStorage.getSeries()) { + dataOperationCount.push(seriesStorageData.getOperationCount()); + dataDataVolume.push(seriesStorageData.getDataVolume()); + } + + + options.series().addToEnd(seriesOperationCount); + options.series().addToEnd(seriesDataVolume); + + options.chart().showAxes(true); + + options.legend().enabled(true); + // options.legend().layout("vertical"); + // options.legend().align("left"); + // options.legend().x(120); + // options.legend().verticalAlign("top"); + // options.legend().y(100); + // options.legend().floating(true); + // options.legend() + // .backgroundColor( + // "(Highcharts.theme && Highcharts.theme.legendBackgroundColor) || 'white'"); + + HighchartsLayoutPanel highchartsLayoutPanel = new HighchartsLayoutPanel(); + + highchartsLayoutPanel.renderChart(options); + + add(highchartsLayoutPanel); + forceLayout(); + } + + private void createServiceChart(AccountingStateData accountingStateData) { + clear(); + if (accountingStateData == null + || accountingStateData.getAccountingType() == null + || accountingStateData.getSeriesRequest() == null + || accountingStateData.getSeriesResponse() == null) { + forceLayout(); + return; + } + + if(!(accountingStateData + .getSeriesResponse() instanceof SeriesService)){ + forceLayout(); + return; + } + + + SeriesService seriesService = (SeriesService) accountingStateData + .getSeriesResponse(); + + double minRange = calculateMinRange(accountingStateData + .getSeriesRequest().getAccountingPeriod()); + + double interval=calculateInterval(accountingStateData + .getSeriesRequest().getAccountingPeriod()); + + Date dateStart=accountingStateData.getSeriesRequest().getAccountingPeriod().getStartDate(); + + HighchartsOptionFactory highchartsFactory = new JsoHighchartsOptionFactory(); + ChartOptions options = highchartsFactory.createChartOptions(); + options.chart().zoomType("x"); + + options.title().text("Accounting Service"); + + options.subtitle().text("Click and drag in the plot area to zoom in"); + + ArrayString colors = options.colors(); + // colors.setValue(0, "#cc0038"); + // colors.setValue(1, "#32cd32"); + + + // xAxis + options.xAxis().type("datetime").minRange(minRange); + + // yAxis + // options.yAxis().title().text("Exchange rate"); + // Highcharts.getOptions().colors[0] + String multiAxis = "[{" + " \"id\": \"OperationCount\"," + + " \"labels\": { " + " \"format\": \"{value}\"," + + " \"style\": { " + " \"color\": \"" + + colors.get(1) + + "\"" + + " }" + + " }," + + " \"title\": { " + + " \"text\": \"Operation Count\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(1) + + "\"" + + " }" + + " }" + + "} , {" + + " \"id\": \"Duration\", " + + " \"title\": {" + + " \"text\": \"Duration\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(0) + + "\"" + + " }" + + " }," + + " \"labels\": {" + + " \"format\": \"{value} ms\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(0) + + "\"" + + " }" + + " }," + " \"opposite\": \"true\"" + + "} , {" + + " \"id\": \"MaxInvocationTime\", " + + " \"title\": {" + + " \"text\": \"Max Invocation Time\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(2) + + "\"" + + " }" + + " }," + + " \"labels\": {" + + " \"format\": \"{value} ms\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(2) + + "\"" + + " }" + + " }," + " \"opposite\": \"true\"" + + "} , {" + + " \"id\": \"MinInvocationTime\", " + + " \"title\": {" + + " \"text\": \"Min Invocation Time\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(3) + + "\"" + + " }" + + " }," + + " \"labels\": {" + + " \"format\": \"{value} ms\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(3) + + "\"" + + " }" + + " }," + " \"opposite\": \"true\"" + "}]" + + ; + + options.setFieldAsJsonObject("yAxis", multiAxis); + + // TODO does not seem to be working + String fillcolor = "{" + "\"linearGradient\": {" + "\"x1\": 0," + + "\"y1\": 0," + "\"x2\": 0," + "\"y2\": 1" + "}," + + "\"stops\": [" + "[" + "0, \"#058DC7\"" + "]," + "[" + + "1, \"#FFFFFF\"" + "]" + "]" + "}"; + + options.plotOptions().area() + .setFieldAsJsonObject("fillColor", fillcolor).marker() + .radius(2).lineWidth(1).states().hover().lineWidth(1); + + + + SeriesColumn seriesOperationCount = highchartsFactory.createSeriesColumn(); + seriesOperationCount.name("Operation Count"); + seriesOperationCount.color(colors.get(1)); + seriesOperationCount.type("column"); + + ArrayNumber dataOperationCount = seriesOperationCount + .dataAsArrayNumber(); + + seriesOperationCount.pointInterval(interval).pointStart(dateStart.getTime()); + + SeriesArea seriesDuration = highchartsFactory.createSeriesArea(); + seriesDuration.name("Duration"); + seriesDuration.color(colors.get(0)); + seriesDuration.yAxisAsString("Duration"); + + + ArrayNumber dataDuration = seriesDuration.dataAsArrayNumber(); + + + seriesDuration.pointInterval(interval).pointStart( + dateStart.getTime()); + + SeriesArea seriesMaxInvocationTime = highchartsFactory.createSeriesArea(); + seriesMaxInvocationTime.name("Max Invocation Time"); + seriesMaxInvocationTime.color(colors.get(2)); + seriesMaxInvocationTime.yAxisAsString("MaxInvocationTime"); + + + ArrayNumber dataMaxInvocationTime = seriesMaxInvocationTime.dataAsArrayNumber(); + + + seriesMaxInvocationTime.pointInterval(interval).pointStart( + dateStart.getTime()); + + SeriesArea seriesMinInvocationTime = highchartsFactory.createSeriesArea(); + seriesMinInvocationTime.name("Min Invocation Time"); + seriesMinInvocationTime.color(colors.get(3)); + seriesMinInvocationTime.yAxisAsString("MinInvocationTime"); + + + ArrayNumber dataMinInvocationTime = seriesMinInvocationTime.dataAsArrayNumber(); + + + seriesMinInvocationTime.pointInterval(interval).pointStart( + dateStart.getTime()); + + + + for (SeriesServiceData seriesServiceData : seriesService.getSeries()) { + dataOperationCount.push(seriesServiceData.getOperationCount()); + dataDuration.push(seriesServiceData.getDuration()); + dataMaxInvocationTime.push(seriesServiceData.getMaxInvocationTime()); + dataMinInvocationTime.push(seriesServiceData.getMinInvocationTime()); + } + + options.series().addToEnd(seriesOperationCount); + options.series().addToEnd(seriesDuration); + options.series().addToEnd(seriesMaxInvocationTime); + options.series().addToEnd(seriesMinInvocationTime); + + options.chart().showAxes(true); + + options.legend().enabled(true); + // options.legend().layout("vertical"); + // options.legend().align("left"); + // options.legend().x(120); + // options.legend().verticalAlign("top"); + // options.legend().y(100); + // options.legend().floating(true); + // options.legend() + // .backgroundColor( + // "(Highcharts.theme && Highcharts.theme.legendBackgroundColor) || 'white'"); + + HighchartsLayoutPanel highchartsLayoutPanel = new HighchartsLayoutPanel(); + + highchartsLayoutPanel.renderChart(options); + + add(highchartsLayoutPanel); + forceLayout(); + } + + private void createPortletChart(AccountingStateData accountingStateData) { + clear(); + if (accountingStateData == null + || accountingStateData.getAccountingType() == null + || accountingStateData.getSeriesRequest() == null + || accountingStateData.getSeriesResponse() == null) { + forceLayout(); + return; + } + + if(!(accountingStateData + .getSeriesResponse() instanceof SeriesPortlet)){ + forceLayout(); + return; + } + + + SeriesStorage seriesStorage = (SeriesStorage) accountingStateData + .getSeriesResponse(); + + double minRange = calculateMinRange(accountingStateData + .getSeriesRequest().getAccountingPeriod()); + + double interval=calculateInterval(accountingStateData + .getSeriesRequest().getAccountingPeriod()); + + Date dateStart=accountingStateData.getSeriesRequest().getAccountingPeriod().getStartDate(); + + HighchartsOptionFactory highchartsFactory = new JsoHighchartsOptionFactory(); + ChartOptions options = highchartsFactory.createChartOptions(); + options.chart().zoomType("x"); + + options.title().text("Accounting Portlet"); + + options.subtitle().text("Click and drag in the plot area to zoom in"); + + ArrayString colors = options.colors(); + // colors.setValue(0, "#cc0038"); + // colors.setValue(1, "#32cd32"); + + + // xAxis + options.xAxis().type("datetime").minRange(minRange); + + // yAxis + // options.yAxis().title().text("Exchange rate"); + // Highcharts.getOptions().colors[0] + String multiAxis = "[{" + " \"id\": \"DataVolume\"," + + " \"labels\": { " + " \"format\": \"{value}\"," + + " \"style\": { " + " \"color\": \"" + + colors.get(1) + + "\"" + + " }" + + " }," + + " \"title\": { " + + " \"text\": \"Data Volume\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(1) + + "\"" + + " }" + + " }" + + "} , {" + + " \"id\": \"OperationCount\", " + + " \"title\": {" + + " \"text\": \"Operation Count\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(0) + + "\"" + + " }" + + " }," + + " \"labels\": {" + + " \"format\": \"{value}\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(0) + + "\"" + + " }" + + " }," + " \"opposite\": \"true\"" + "}]"; + + options.setFieldAsJsonObject("yAxis", multiAxis); + + // TODO does not seem to be working + String fillcolor = "{" + "\"linearGradient\": {" + "\"x1\": 0," + + "\"y1\": 0," + "\"x2\": 0," + "\"y2\": 1" + "}," + + "\"stops\": [" + "[" + "0, \"#058DC7\"" + "]," + "[" + + "1, \"#FFFFFF\"" + "]" + "]" + "}"; + + options.plotOptions().area() + .setFieldAsJsonObject("fillColor", fillcolor).marker() + .radius(2).lineWidth(1).states().hover().lineWidth(1); + + SeriesColumn seriesDataVolume = highchartsFactory.createSeriesColumn(); + seriesDataVolume.name("Data Volume"); + seriesDataVolume.color(colors.get(1)); + seriesDataVolume.type("column"); + + ArrayNumber dataDataVolume = seriesDataVolume.dataAsArrayNumber(); + + + seriesDataVolume.pointInterval(interval).pointStart( + dateStart.getTime()); + + + SeriesArea seriesOperationCount = highchartsFactory.createSeriesArea(); + seriesOperationCount.name("Operation Count"); + seriesOperationCount.yAxisAsString("OperationCount"); + seriesOperationCount.color(colors.get(0)); + + ArrayNumber dataOperationCount = seriesOperationCount + .dataAsArrayNumber(); + + seriesOperationCount.pointInterval(interval).pointStart(dateStart.getTime()); + + + + for (SeriesStorageData seriesStorageData : seriesStorage.getSeries()) { + dataDataVolume.push(seriesStorageData.getDataVolume()); + dataOperationCount.push(seriesStorageData.getOperationCount()); + } + + options.series().addToEnd(seriesDataVolume); + options.series().addToEnd(seriesOperationCount); + + options.chart().showAxes(true); + + options.legend().enabled(true); + // options.legend().layout("vertical"); + // options.legend().align("left"); + // options.legend().x(120); + // options.legend().verticalAlign("top"); + // options.legend().y(100); + // options.legend().floating(true); + // options.legend() + // .backgroundColor( + // "(Highcharts.theme && Highcharts.theme.legendBackgroundColor) || 'white'"); + + HighchartsLayoutPanel highchartsLayoutPanel = new HighchartsLayoutPanel(); + + highchartsLayoutPanel.renderChart(options); + + add(highchartsLayoutPanel); + forceLayout(); + } + + private void createTaskChart(AccountingStateData accountingStateData) { + clear(); + if (accountingStateData == null + || accountingStateData.getAccountingType() == null + || accountingStateData.getSeriesRequest() == null + || accountingStateData.getSeriesResponse() == null) { + forceLayout(); + return; + } + + if(!(accountingStateData + .getSeriesResponse() instanceof SeriesTask)){ + forceLayout(); + return; + } + + + SeriesStorage seriesStorage = (SeriesStorage) accountingStateData + .getSeriesResponse(); + + double minRange = calculateMinRange(accountingStateData + .getSeriesRequest().getAccountingPeriod()); + + double interval=calculateInterval(accountingStateData + .getSeriesRequest().getAccountingPeriod()); + + Date dateStart=accountingStateData.getSeriesRequest().getAccountingPeriod().getStartDate(); + + HighchartsOptionFactory highchartsFactory = new JsoHighchartsOptionFactory(); + ChartOptions options = highchartsFactory.createChartOptions(); + options.chart().zoomType("x"); + + options.title().text("Accounting Task"); + + options.subtitle().text("Click and drag in the plot area to zoom in"); + + ArrayString colors = options.colors(); + // colors.setValue(0, "#cc0038"); + // colors.setValue(1, "#32cd32"); + + + // xAxis + options.xAxis().type("datetime").minRange(minRange); + + // yAxis + // options.yAxis().title().text("Exchange rate"); + // Highcharts.getOptions().colors[0] + String multiAxis = "[{" + " \"id\": \"DataVolume\"," + + " \"labels\": { " + " \"format\": \"{value}\"," + + " \"style\": { " + " \"color\": \"" + + colors.get(1) + + "\"" + + " }" + + " }," + + " \"title\": { " + + " \"text\": \"Data Volume\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(1) + + "\"" + + " }" + + " }" + + "} , {" + + " \"id\": \"OperationCount\", " + + " \"title\": {" + + " \"text\": \"Operation Count\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(0) + + "\"" + + " }" + + " }," + + " \"labels\": {" + + " \"format\": \"{value}\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(0) + + "\"" + + " }" + + " }," + " \"opposite\": \"true\"" + "}]"; + + options.setFieldAsJsonObject("yAxis", multiAxis); + + // TODO does not seem to be working + String fillcolor = "{" + "\"linearGradient\": {" + "\"x1\": 0," + + "\"y1\": 0," + "\"x2\": 0," + "\"y2\": 1" + "}," + + "\"stops\": [" + "[" + "0, \"#058DC7\"" + "]," + "[" + + "1, \"#FFFFFF\"" + "]" + "]" + "}"; + + options.plotOptions().area() + .setFieldAsJsonObject("fillColor", fillcolor).marker() + .radius(2).lineWidth(1).states().hover().lineWidth(1); + + SeriesColumn seriesDataVolume = highchartsFactory.createSeriesColumn(); + seriesDataVolume.name("Data Volume"); + seriesDataVolume.color(colors.get(1)); + seriesDataVolume.type("column"); + + ArrayNumber dataDataVolume = seriesDataVolume.dataAsArrayNumber(); + + + seriesDataVolume.pointInterval(interval).pointStart( + dateStart.getTime()); + + + SeriesArea seriesOperationCount = highchartsFactory.createSeriesArea(); + seriesOperationCount.name("Operation Count"); + seriesOperationCount.yAxisAsString("OperationCount"); + seriesOperationCount.color(colors.get(0)); + + ArrayNumber dataOperationCount = seriesOperationCount + .dataAsArrayNumber(); + + seriesOperationCount.pointInterval(interval).pointStart(dateStart.getTime()); + + + + for (SeriesStorageData seriesStorageData : seriesStorage.getSeries()) { + dataDataVolume.push(seriesStorageData.getDataVolume()); + dataOperationCount.push(seriesStorageData.getOperationCount()); + } + + options.series().addToEnd(seriesDataVolume); + options.series().addToEnd(seriesOperationCount); + + options.chart().showAxes(true); + + options.legend().enabled(true); + // options.legend().layout("vertical"); + // options.legend().align("left"); + // options.legend().x(120); + // options.legend().verticalAlign("top"); + // options.legend().y(100); + // options.legend().floating(true); + // options.legend() + // .backgroundColor( + // "(Highcharts.theme && Highcharts.theme.legendBackgroundColor) || 'white'"); + + HighchartsLayoutPanel highchartsLayoutPanel = new HighchartsLayoutPanel(); + + highchartsLayoutPanel.renderChart(options); + + add(highchartsLayoutPanel); + forceLayout(); + } + + + private void createJobChart(AccountingStateData accountingStateData) { + clear(); + if (accountingStateData == null + || accountingStateData.getAccountingType() == null + || accountingStateData.getSeriesRequest() == null + || accountingStateData.getSeriesResponse() == null) { + forceLayout(); + return; + } + + if(!(accountingStateData + .getSeriesResponse() instanceof SeriesJob)){ + forceLayout(); + return; + } + + + SeriesStorage seriesStorage = (SeriesStorage) accountingStateData + .getSeriesResponse(); + + double minRange = calculateMinRange(accountingStateData + .getSeriesRequest().getAccountingPeriod()); + + double interval=calculateInterval(accountingStateData + .getSeriesRequest().getAccountingPeriod()); + + Date dateStart=accountingStateData.getSeriesRequest().getAccountingPeriod().getStartDate(); + + HighchartsOptionFactory highchartsFactory = new JsoHighchartsOptionFactory(); + ChartOptions options = highchartsFactory.createChartOptions(); + options.chart().zoomType("x"); + + options.title().text("Accounting Job"); + + options.subtitle().text("Click and drag in the plot area to zoom in"); + + ArrayString colors = options.colors(); + // colors.setValue(0, "#cc0038"); + // colors.setValue(1, "#32cd32"); + + + // xAxis + options.xAxis().type("datetime").minRange(minRange); + + // yAxis + // options.yAxis().title().text("Exchange rate"); + // Highcharts.getOptions().colors[0] + String multiAxis = "[{" + " \"id\": \"DataVolume\"," + + " \"labels\": { " + " \"format\": \"{value}\"," + + " \"style\": { " + " \"color\": \"" + + colors.get(1) + + "\"" + + " }" + + " }," + + " \"title\": { " + + " \"text\": \"Data Volume\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(1) + + "\"" + + " }" + + " }" + + "} , {" + + " \"id\": \"OperationCount\", " + + " \"title\": {" + + " \"text\": \"Operation Count\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(0) + + "\"" + + " }" + + " }," + + " \"labels\": {" + + " \"format\": \"{value}\"," + + " \"style\": {" + + " \"color\": \"" + + colors.get(0) + + "\"" + + " }" + + " }," + " \"opposite\": \"true\"" + "}]"; + + options.setFieldAsJsonObject("yAxis", multiAxis); + + // TODO does not seem to be working + String fillcolor = "{" + "\"linearGradient\": {" + "\"x1\": 0," + + "\"y1\": 0," + "\"x2\": 0," + "\"y2\": 1" + "}," + + "\"stops\": [" + "[" + "0, \"#058DC7\"" + "]," + "[" + + "1, \"#FFFFFF\"" + "]" + "]" + "}"; + + options.plotOptions().area() + .setFieldAsJsonObject("fillColor", fillcolor).marker() + .radius(2).lineWidth(1).states().hover().lineWidth(1); + + SeriesColumn seriesDataVolume = highchartsFactory.createSeriesColumn(); + seriesDataVolume.name("Data Volume"); + seriesDataVolume.color(colors.get(1)); + seriesDataVolume.type("column"); + + ArrayNumber dataDataVolume = seriesDataVolume.dataAsArrayNumber(); + + + seriesDataVolume.pointInterval(interval).pointStart( + dateStart.getTime()); + + + SeriesArea seriesOperationCount = highchartsFactory.createSeriesArea(); + seriesOperationCount.name("Operation Count"); + seriesOperationCount.yAxisAsString("OperationCount"); + seriesOperationCount.color(colors.get(0)); + + ArrayNumber dataOperationCount = seriesOperationCount + .dataAsArrayNumber(); + + seriesOperationCount.pointInterval(interval).pointStart(dateStart.getTime()); + + + + for (SeriesStorageData seriesStorageData : seriesStorage.getSeries()) { + dataDataVolume.push(seriesStorageData.getDataVolume()); + dataOperationCount.push(seriesStorageData.getOperationCount()); + } + + options.series().addToEnd(seriesDataVolume); + options.series().addToEnd(seriesOperationCount); + + options.chart().showAxes(true); + + options.legend().enabled(true); + // options.legend().layout("vertical"); + // options.legend().align("left"); + // options.legend().x(120); + // options.legend().verticalAlign("top"); + // options.legend().y(100); + // options.legend().floating(true); + // options.legend() + // .backgroundColor( + // "(Highcharts.theme && Highcharts.theme.legendBackgroundColor) || 'white'"); + + HighchartsLayoutPanel highchartsLayoutPanel = new HighchartsLayoutPanel(); + + highchartsLayoutPanel.renderChart(options); + + add(highchartsLayoutPanel); + forceLayout(); + } + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/MainDataPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/MainDataPanel.java new file mode 100644 index 0000000..b07ec38 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/maindata/MainDataPanel.java @@ -0,0 +1,42 @@ +package org.gcube.portlets.admin.accountingmanager.client.maindata; + +import com.google.gwt.event.shared.EventBus; +import com.sencha.gxt.widget.core.client.FramedPanel; + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public class MainDataPanel extends FramedPanel { + + private EventBus eventBus; + + public MainDataPanel(EventBus eventBus) { + super(); + this.eventBus = eventBus; + // msgs = GWT.create(ServiceCategoryMessages.class); + init(); + create(); + + } + + protected void init() { + forceLayoutOnResize = true; + setBodyBorder(false); + setBorders(false); + setHeaderVisible(false); + + } + + protected void create() { + /*ChartPanel chartPanel = new ChartPanel(eventBus); + add(chartPanel);*/ + HightChartPanel hightChartPanel= new HightChartPanel(eventBus); + add(hightChartPanel); + + + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/menu/AccountingManagerMenu.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/menu/AccountingManagerMenu.java new file mode 100644 index 0000000..668f075 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/menu/AccountingManagerMenu.java @@ -0,0 +1,92 @@ +package org.gcube.portlets.admin.accountingmanager.client.menu; + +import org.gcube.portlets.admin.accountingmanager.client.event.AccountingMenuEvent; +import org.gcube.portlets.admin.accountingmanager.client.resource.AccountingManagerResources; +import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingType; + +import com.allen_sauer.gwt.log.client.Log; +import com.google.gwt.core.client.GWT; +import com.google.gwt.event.logical.shared.SelectionEvent; +import com.google.gwt.event.logical.shared.SelectionHandler; +import com.google.gwt.event.shared.EventBus; +import com.google.gwt.user.client.ui.Widget; +import com.sencha.gxt.theme.neptune.client.base.tabs.Css3BigTabPanelAppearance; +import com.sencha.gxt.widget.core.client.TabItemConfig; +import com.sencha.gxt.widget.core.client.TabPanel; + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public class AccountingManagerMenu extends TabPanel { + //private AccountingManagerMenuMessages msgs; + private EventBus eventBus; + + + public AccountingManagerMenu(EventBus eventBus) { + super(GWT.create(Css3BigTabPanelAppearance.class)); + Log.debug("Create AccountingManagerMenu"); + this.eventBus = eventBus; + //this.msgs = GWT.create(AccountingManagerMenuMessages.class); + setBodyBorder(false); + setBorders(false); + setAnimScroll(false); + setTabScroll(false); + setCloseContextMenu(true); + addTabs(); + setHeight(60); + + } + + protected void addTabs() { + TabItemConfig storageItemConf = new TabItemConfig("Storage", false); + storageItemConf.setIcon(AccountingManagerResources.INSTANCE.accountingStorage48()); + EmptyPanel storageCategory=new EmptyPanel(AccountingType.STORAGE.name()); + add(storageCategory, storageItemConf); + + TabItemConfig serviceItemConf = new TabItemConfig("Service", false); + serviceItemConf.setIcon(AccountingManagerResources.INSTANCE.accountingService48()); + EmptyPanel serviceCategory=new EmptyPanel(AccountingType.SERVICE.name()); + add(serviceCategory, serviceItemConf); + + TabItemConfig portletItemConf = new TabItemConfig("Portlet", false); + portletItemConf.setIcon(AccountingManagerResources.INSTANCE.accountingPortlet48()); + EmptyPanel portletCategory=new EmptyPanel(AccountingType.PORTLET.name()); + add(portletCategory, portletItemConf); + + TabItemConfig taskItemConf = new TabItemConfig("Task", false); + taskItemConf.setIcon(AccountingManagerResources.INSTANCE.accountingTask48()); + EmptyPanel taskCategory=new EmptyPanel(AccountingType.TASK.name()); + add(taskCategory, taskItemConf); + + TabItemConfig jobItemConf = new TabItemConfig("Job", false); + jobItemConf.setIcon(AccountingManagerResources.INSTANCE.accountingJob48()); + EmptyPanel jobCategory=new EmptyPanel(AccountingType.JOB.name()); + add(jobCategory, jobItemConf); + + + setActiveWidget(getWidget(0)); + + + addSelectionHandler(new SelectionHandler() { + + @Override + public void onSelection(SelectionEvent event) { + Widget widget = event.getSelectedItem(); + if (widget instanceof EmptyPanel) { + EmptyPanel p=(EmptyPanel) widget; + AccountingMenuEvent accountMenuEvent=new AccountingMenuEvent(AccountingType.valueOf(p.getId())); + eventBus.fireEvent(accountMenuEvent); + } else { + + } + + } + }); + } + + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/menu/EmptyPanel.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/menu/EmptyPanel.java new file mode 100644 index 0000000..f031acf --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/menu/EmptyPanel.java @@ -0,0 +1,38 @@ +package org.gcube.portlets.admin.accountingmanager.client.menu; + +import com.sencha.gxt.widget.core.client.ContentPanel; + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public class EmptyPanel extends ContentPanel { + + private String id; + + public EmptyPanel(String id){ + this.id=id; + init(); + } + + private void init(){ + setId(id); + setWidth(0); + setHeight(0); + setBodyBorder(false); + setBorders(false); + setHeaderVisible(false); + setVisible(false); + + } + + public String getId() { + return id; + } + + + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/AccountingMonitor.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/AccountingMonitor.java new file mode 100644 index 0000000..cb2b84c --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/monitor/AccountingMonitor.java @@ -0,0 +1,63 @@ +package org.gcube.portlets.admin.accountingmanager.client.monitor; + +import com.google.gwt.safehtml.shared.SafeHtml; +import com.sencha.gxt.widget.core.client.box.AutoProgressMessageBox; + +/** + * + * @author giancarlo email: g.panichi@isti.cnr.it + * + */ +public class AccountingMonitor extends AutoProgressMessageBox { + + public AccountingMonitor(){ + super("Waiting", "Please wait..."); + create(); + } + + /** + * + * {@inheritDoc} + */ + public AccountingMonitor(SafeHtml headingHtml, SafeHtml messageHtml) { + super(headingHtml, messageHtml); + create(); + } + + /** + * + * {@inheritDoc} + */ + public AccountingMonitor(SafeHtml headingHtml) { + super(headingHtml); + create(); + } + + /** + * + * {@inheritDoc} + */ + public AccountingMonitor(String headingHtml, String messageHtml) { + super(headingHtml, messageHtml); + create(); + } + + /** + * + * {@inheritDoc} + */ + public AccountingMonitor(String headingHtml) { + super(headingHtml); + create(); + } + + private void create() { + setProgressText("Updating..."); + auto(); + show(); + } + + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/properties/AccountingPeriodModePropertiesCombo.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/properties/AccountingPeriodModePropertiesCombo.java new file mode 100644 index 0000000..6241279 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/properties/AccountingPeriodModePropertiesCombo.java @@ -0,0 +1,24 @@ +package org.gcube.portlets.admin.accountingmanager.client.properties; + +import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingPeriodMode; + +import com.google.gwt.editor.client.Editor.Path; +import com.sencha.gxt.data.shared.LabelProvider; +import com.sencha.gxt.data.shared.ModelKeyProvider; +import com.sencha.gxt.data.shared.PropertyAccess; + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public interface AccountingPeriodModePropertiesCombo extends + PropertyAccess { + + @Path("id") + ModelKeyProvider id(); + + LabelProvider label(); + +} \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManager.css b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManager.css new file mode 100644 index 0000000..57cee7a --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManager.css @@ -0,0 +1,7 @@ +@CHARSET "UTF-8"; + + +.ribbon { + line-height: 13px; + font-size: 11px; +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManagerCSS.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManagerCSS.java new file mode 100644 index 0000000..63ebffa --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManagerCSS.java @@ -0,0 +1,20 @@ +/** + * + */ +package org.gcube.portlets.admin.accountingmanager.client.resource; + +import com.google.gwt.resources.client.CssResource; + +/** + * + * @author "Giancarlo Panichi" + * g.panichi@isti.cnr.it + * + */ +public interface AccountingManagerCSS extends CssResource { + + @ClassName("ribbon") + public String getRibbon(); + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManagerResources.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManagerResources.java new file mode 100644 index 0000000..a62be38 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManagerResources.java @@ -0,0 +1,90 @@ +/** + * + */ +package org.gcube.portlets.admin.accountingmanager.client.resource; + + +import com.google.gwt.core.client.GWT; +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.ImageResource; + + +/** + * + * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + */ +public interface AccountingManagerResources extends ClientBundle { + + public static final AccountingManagerResources INSTANCE = GWT + .create(AccountingManagerResources.class); + + @Source("AccountingManager.css") + AccountingManagerCSS accountingManagerCSS(); + + + @Source("accounting-manager_128.png") + ImageResource accountingManager128(); + + @Source("accounting-storage_128.png") + ImageResource accountingStorage128(); + + @Source("accounting-service_128.png") + ImageResource accountingService128(); + + @Source("accounting-portlet_128.png") + ImageResource accountingPortlet128(); + + @Source("accounting-task_128.png") + ImageResource accountingTask128(); + + @Source("accounting-job_128.png") + ImageResource accountingJob128(); + + @Source("accounting-manager_48.png") + ImageResource accountingManager48(); + + @Source("accounting-storage_48.png") + ImageResource accountingStorage48(); + + @Source("accounting-service_48.png") + ImageResource accountingService48(); + + @Source("accounting-portlet_48.png") + ImageResource accountingPortlet48(); + + @Source("accounting-task_48.png") + ImageResource accountingTask48(); + + @Source("accounting-job_48.png") + ImageResource accountingJob48(); + + @Source("accounting-manager_32.png") + ImageResource accountingManager32(); + + @Source("accounting-storage_32.png") + ImageResource accountingStorage32(); + + @Source("accounting-service_32.png") + ImageResource accountingService32(); + + @Source("accounting-portlet_32.png") + ImageResource accountingPortlet32(); + + @Source("accounting-task_32.png") + ImageResource accountingTask32(); + + @Source("accounting-job_32.png") + ImageResource accountingJob32(); + + @Source("accounting-reload_16.png") + ImageResource accountingReload16(); + + @Source("accounting-reload_24.png") + ImageResource accountingReload24(); + + @Source("accounting-reload_32.png") + ImageResource accountingReload32(); + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-job_128.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-job_128.png new file mode 100644 index 0000000..ce31db4 Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-job_128.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-job_32.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-job_32.png new file mode 100644 index 0000000..86a10b0 Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-job_32.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-job_48.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-job_48.png new file mode 100644 index 0000000..e5485a6 Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-job_48.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-manager_128.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-manager_128.png new file mode 100644 index 0000000..094380b Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-manager_128.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-manager_32.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-manager_32.png new file mode 100644 index 0000000..a3b5803 Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-manager_32.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-manager_48.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-manager_48.png new file mode 100644 index 0000000..19bce4e Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-manager_48.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-portlet_128.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-portlet_128.png new file mode 100644 index 0000000..3c98f92 Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-portlet_128.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-portlet_32.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-portlet_32.png new file mode 100644 index 0000000..70f6a54 Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-portlet_32.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-portlet_48.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-portlet_48.png new file mode 100644 index 0000000..e1be629 Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-portlet_48.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-reload_16.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-reload_16.png new file mode 100644 index 0000000..32ba03c Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-reload_16.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-reload_24.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-reload_24.png new file mode 100644 index 0000000..b08e139 Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-reload_24.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-reload_32.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-reload_32.png new file mode 100644 index 0000000..f46779d Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-reload_32.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-service_128.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-service_128.png new file mode 100644 index 0000000..08860fe Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-service_128.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-service_32.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-service_32.png new file mode 100644 index 0000000..cbdb5ba Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-service_32.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-service_48.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-service_48.png new file mode 100644 index 0000000..6337486 Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-service_48.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-storage_128.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-storage_128.png new file mode 100644 index 0000000..948c95f Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-storage_128.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-storage_32.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-storage_32.png new file mode 100644 index 0000000..57202d0 Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-storage_32.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-storage_48.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-storage_48.png new file mode 100644 index 0000000..b367990 Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-storage_48.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-task_128.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-task_128.png new file mode 100644 index 0000000..ef9c320 Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-task_128.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-task_32.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-task_32.png new file mode 100644 index 0000000..cf9ccc5 Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-task_32.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-task_48.png b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-task_48.png new file mode 100644 index 0000000..5d62f77 Binary files /dev/null and b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-task_48.png differ diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/rpc/AccountingManagerService.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/rpc/AccountingManagerService.java new file mode 100644 index 0000000..821f8d3 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/rpc/AccountingManagerService.java @@ -0,0 +1,39 @@ +package org.gcube.portlets.admin.accountingmanager.client.rpc; + + +import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingType; +import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesRequest; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesResponse; +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException; +import org.gcube.portlets.admin.accountingmanager.shared.session.UserInfo; + +import com.google.gwt.user.client.rpc.RemoteService; +import com.google.gwt.user.client.rpc.RemoteServiceRelativePath; + +/** + * + * @author "Giancarlo Panichi" + * g.panichi@isti.cnr.it + * + */ +@RemoteServiceRelativePath("ams") +public interface AccountingManagerService extends RemoteService { + /** + * Get informations on the current user + * + * @return + * @throws AccountingManagerServiceException + */ + public UserInfo hello() throws AccountingManagerServiceException; + + /** + * Retrieve Accounting Series + * + * @param accountingType the resource on which to accounting + * @param seriesRequest filters and constraints descriptions + * @return + * @throws AccountingManagerServiceException + */ + public SeriesResponse getSeries(AccountingType accountingType, SeriesRequest seriesRequest) throws AccountingManagerServiceException; + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/rpc/AccountingManagerServiceAsync.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/rpc/AccountingManagerServiceAsync.java new file mode 100644 index 0000000..c44a1ce --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/rpc/AccountingManagerServiceAsync.java @@ -0,0 +1,43 @@ +/** + * + */ +package org.gcube.portlets.admin.accountingmanager.client.rpc; + + +import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingType; +import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesRequest; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesResponse; +import org.gcube.portlets.admin.accountingmanager.shared.session.UserInfo; + +import com.google.gwt.core.client.GWT; +import com.google.gwt.user.client.rpc.AsyncCallback; + +/** + * + * @author "Giancarlo Panichi" + * g.panichi@isti.cnr.it + * + */ +public interface AccountingManagerServiceAsync { + + public static AccountingManagerServiceAsync INSTANCE = (AccountingManagerServiceAsync) GWT + .create(AccountingManagerService.class); + + /** + * + * @param callback + */ + void hello(AsyncCallback callback); + + + /** + * Retrieve Accounting Series + * + * @param accountingType the resource on which to accounting + * @param seriesRequest filters and constraints descriptions + * @param callback + */ + void getSeries(AccountingType accountingType, SeriesRequest seriesRequest,AsyncCallback callback); + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/state/AccountingState.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/state/AccountingState.java new file mode 100644 index 0000000..1e504aa --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/state/AccountingState.java @@ -0,0 +1,39 @@ +package org.gcube.portlets.admin.accountingmanager.client.state; + +import java.io.Serializable; +import java.util.HashMap; + +import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingType; + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public class AccountingState implements Serializable { + + private static final long serialVersionUID = 5993049979009321365L; + private HashMap clientState; + + public AccountingState(){ + clientState=new HashMap(); + } + + + public AccountingStateData getState(AccountingType accountingType){ + return clientState.get(accountingType); + } + + public void setState(AccountingType accountingType, AccountingStateData accountingStateData){ + clientState.put(accountingType,accountingStateData); + } + + + @Override + public String toString() { + return "AccountingState [clientState=" + clientState + "]"; + } + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/state/AccountingStateData.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/state/AccountingStateData.java new file mode 100644 index 0000000..c096d37 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/state/AccountingStateData.java @@ -0,0 +1,65 @@ +package org.gcube.portlets.admin.accountingmanager.client.state; + +import java.io.Serializable; + +import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingType; +import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesRequest; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesResponse; + +/** + * + * @author giancarlo email: g.panichi@isti.cnr.it + * + */ +public class AccountingStateData implements Serializable { + + private static final long serialVersionUID = 4853602427569285252L; + private AccountingType accountingType; + private SeriesRequest seriesRequest; + private SeriesResponse seriesResponse; + + public AccountingStateData() { + super(); + } + + public AccountingStateData(AccountingType accountingType, + SeriesRequest seriesRequest, SeriesResponse seriesResponse) { + super(); + this.accountingType = accountingType; + this.seriesRequest = seriesRequest; + this.seriesResponse = seriesResponse; + } + + public AccountingType getAccountingType() { + return accountingType; + } + + public void setAccountingType(AccountingType accountingType) { + this.accountingType = accountingType; + } + + public SeriesRequest getSeriesRequest() { + return seriesRequest; + } + + public void setSeriesRequest(SeriesRequest seriesRequest) { + this.seriesRequest = seriesRequest; + } + + public SeriesResponse getSeriesResponse() { + return seriesResponse; + } + + public void setSeriesResponse(SeriesResponse seriesResponse) { + this.seriesResponse = seriesResponse; + } + + @Override + public String toString() { + return "AccountingStateData [accountingType=" + accountingType + + ", seriesRequest=" + seriesRequest + ", seriesResponse=" + + seriesResponse + "]"; + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/FiltersChangeType.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/FiltersChangeType.java new file mode 100644 index 0000000..b6339c4 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/FiltersChangeType.java @@ -0,0 +1,14 @@ +/** + * + */ +package org.gcube.portlets.admin.accountingmanager.client.type; + +/** + * + * @author "Giancarlo Panichi" + * g.panichi@isti.cnr.it + * + */ +public enum FiltersChangeType { + Update +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/SessionExpiredType.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/SessionExpiredType.java new file mode 100644 index 0000000..c80177b --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/SessionExpiredType.java @@ -0,0 +1,13 @@ +package org.gcube.portlets.admin.accountingmanager.client.type; + +/** + * + * @author "Giancarlo Panichi" + * g.panichi@isti.cnr.it + * + */ +public enum SessionExpiredType { + EXPIRED, + EXPIREDONSERVER; + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/StateChangeType.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/StateChangeType.java new file mode 100644 index 0000000..ee126c3 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/StateChangeType.java @@ -0,0 +1,16 @@ +/** + * + */ +package org.gcube.portlets.admin.accountingmanager.client.type; + +/** + * + * @author "Giancarlo Panichi" + * g.panichi@isti.cnr.it + * + */ +public enum StateChangeType { + Update, + Restore; + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/UIStateType.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/UIStateType.java new file mode 100644 index 0000000..9f0a958 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/type/UIStateType.java @@ -0,0 +1,12 @@ +package org.gcube.portlets.admin.accountingmanager.client.type; + +/** + * + * @author "Giancarlo Panichi" + * g.panichi@isti.cnr.it + * + */ +public enum UIStateType { + START, + WAITING; +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/utils/Format.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/utils/Format.java new file mode 100644 index 0000000..59b11c6 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/utils/Format.java @@ -0,0 +1,37 @@ +/** + * + */ +package org.gcube.portlets.admin.accountingmanager.client.utils; + +/** + * + * @author "Giancarlo Panichi" + * g.panichi@isti.cnr.it + * + */ +public class Format { + + /** + * Converts a file size into a {@link String} representation adding the misure unit. + * @param size the file size. + * @return the textual representation. + */ + public static String fileSize(long size) { + StringBuilder text = new StringBuilder(); + if (size < 1024) { + text.append(size); + text.append(" bytes"); + } else if (size < 1048576) { + text.append(Math.round(((size * 10) / 1024)) / 10); + text.append(" KB"); + } else if (size < 1073741824) { + text.append(Math.round(((size * 10) / 1048576)) / 10); + text.append(" MB"); + } else { + text.append(Math.round(((size * 10) / 1073741824)) / 10); + text.append(" GB"); + } + return text.toString(); + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/utils/InfoMessageBox.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/utils/InfoMessageBox.java new file mode 100644 index 0000000..28136fd --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/utils/InfoMessageBox.java @@ -0,0 +1,28 @@ +package org.gcube.portlets.admin.accountingmanager.client.utils; + +import com.sencha.gxt.widget.core.client.box.MessageBox; + +/** + * + * @author "Giancarlo Panichi" + * g.panichi@isti.cnr.it + * + */ +public class InfoMessageBox extends MessageBox { + + /** + * Creates a message box with an info icon and the specified title and + * message. + * + * @param title + * the message box title + * @param message + * the message displayed in the message box + */ + public InfoMessageBox(String title, String message) { + super(title, message); + + setIcon(ICONS.info()); + } + +} \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/client/utils/UtilsGXT3.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/utils/UtilsGXT3.java new file mode 100644 index 0000000..8f904ed --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/client/utils/UtilsGXT3.java @@ -0,0 +1,79 @@ +package org.gcube.portlets.admin.accountingmanager.client.utils; + + +import com.google.gwt.core.client.Callback; +import com.google.gwt.dom.client.Element; +import com.sencha.gxt.core.client.dom.XElement; +import com.sencha.gxt.widget.core.client.Component; +import com.sencha.gxt.widget.core.client.box.AlertMessageBox; +import com.sencha.gxt.widget.core.client.event.HideEvent; +import com.sencha.gxt.widget.core.client.event.HideEvent.HideHandler; + +/** + * + * @author "Giancarlo Panichi" + * g.panichi@isti.cnr.it + * + */ +public class UtilsGXT3 { + public static void mask(Element element) { + XElement el = element. cast(); + el.mask("Loading..."); + } + + public static void umask(Element element) { + element. cast().unmask(); + } + + + public static void alert(String title, String message) { + final AlertMessageBox d = new AlertMessageBox(title, message); + d.addHideHandler(new HideHandler() { + + public void onHide(HideEvent event) { + + } + }); + d.show(); + + } + + public static void alert(String title, String message, final Callback callback) { + final AlertMessageBox d = new AlertMessageBox(title, message); + d.addHideHandler(new HideHandler() { + + public void onHide(HideEvent event) { + Component comp=event.getSource(); + callback.onSuccess(comp); + } + }); + d.show(); + } + + + public static void info(String title, String message) { + final InfoMessageBox d = new InfoMessageBox(title, message); + d.addHideHandler(new HideHandler() { + + public void onHide(HideEvent event) { + + } + }); + d.show(); + + } + + public static void info(String title, String message, final Callback callback) { + final InfoMessageBox d = new InfoMessageBox(title, message); + d.addHideHandler(new HideHandler() { + + public void onHide(HideEvent event) { + Component comp=event.getSource(); + callback.onSuccess(comp); + } + }); + d.show(); + + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingManagerServiceImpl.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingManagerServiceImpl.java new file mode 100644 index 0000000..039fa01 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/AccountingManagerServiceImpl.java @@ -0,0 +1,95 @@ +package org.gcube.portlets.admin.accountingmanager.server; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpSession; + +import org.gcube.application.framework.core.session.ASLSession; +import org.gcube.portlets.admin.accountingmanager.client.rpc.AccountingManagerService; +import org.gcube.portlets.admin.accountingmanager.server.amservice.AccountingCaller; +import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingType; +import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesRequest; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesResponse; +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException; +import org.gcube.portlets.admin.accountingmanager.shared.session.UserInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.gwt.user.server.rpc.RemoteServiceServlet; + + +/** + * The server side implementation of the RPC service. + */ +@SuppressWarnings("serial") +public class AccountingManagerServiceImpl extends RemoteServiceServlet implements AccountingManagerService { + + private static Logger logger = LoggerFactory.getLogger(AccountingManagerServiceImpl.class); + /** + * {@inheritDoc} + */ + @Override + public void init() throws ServletException { + super.init(); + System.out.println("Fix JAXP: jdk.xml.entityExpansionLimit=0"); + System.setProperty("jdk.xml.entityExpansionLimit", "0"); + + System.out.println("initializing AccountingManager"); + + } + + + + /** + * + * {@inheritDoc} + */ + @Override + public UserInfo hello() throws AccountingManagerServiceException { + try { + HttpSession session = this.getThreadLocalRequest().getSession(); + ASLSession aslSession = SessionUtil.getAslSession(session); + UserInfo userInfo = new UserInfo(aslSession.getUsername(), + aslSession.getGroupId(), aslSession.getGroupName(), + aslSession.getScope(), aslSession.getScopeName(), + aslSession.getUserEmailAddress(), + aslSession.getUserFullName()); + return userInfo; + } catch (AccountingManagerServiceException e) { + e.printStackTrace(); + throw e; + } catch (Throwable e) { + e.printStackTrace(); + logger.error("Hello(): " + e.getLocalizedMessage(), e); + throw new AccountingManagerServiceException(e.getLocalizedMessage()); + } + + } + + /** + * + * {@inheritDoc} + */ + @Override + public SeriesResponse getSeries(AccountingType accountingType, SeriesRequest seriesRequest) throws AccountingManagerServiceException { + try { + HttpSession session = this.getThreadLocalRequest().getSession(); + SessionUtil.getAslSession(session); + AccountingCaller accountingCaller=new AccountingCaller(); + SeriesResponse seriesResponse=accountingCaller.getSeries(accountingType,seriesRequest); + + return seriesResponse; + + } catch (AccountingManagerServiceException e) { + e.printStackTrace(); + throw e; + } catch (Throwable e) { + e.printStackTrace(); + logger.error("Hello(): " + e.getLocalizedMessage(), e); + throw new AccountingManagerServiceException(e.getLocalizedMessage()); + } + + + } + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java new file mode 100644 index 0000000..564ae05 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/SessionUtil.java @@ -0,0 +1,59 @@ +/** + * + */ +package org.gcube.portlets.admin.accountingmanager.server; + +import javax.servlet.http.HttpSession; + +import org.gcube.application.framework.core.session.ASLSession; +import org.gcube.application.framework.core.session.SessionManager; +import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; +import org.gcube.portlets.admin.accountingmanager.shared.Constants; +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerSessionExpiredException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * + * @author "Giancarlo Panichi" g.panichi@isti.cnr.it + * + */ +public class SessionUtil { + + private static Logger logger = LoggerFactory.getLogger(SessionUtil.class); + + public static ASLSession getAslSession(HttpSession httpSession) + throws AccountingManagerSessionExpiredException { + String username = (String) httpSession + .getAttribute(ScopeHelper.USERNAME_ATTRIBUTE); + ASLSession session; + if (username == null) { + logger.warn("no user found in session, use test user"); + /*throw new AccountingManagerSessionExpiredException("Session Expired!");*/ + + + // Remove comment for Test + username = Constants.DEFAULT_USER; + String scope = Constants.DEFAULT_SCOPE; + + httpSession.setAttribute(ScopeHelper.USERNAME_ATTRIBUTE, username); + session = SessionManager.getInstance().getASLSession( + httpSession.getId(), username); + session.setScope(scope); + + } else { + session = SessionManager.getInstance().getASLSession( + httpSession.getId(), username); + + } + + logger.info("SessionUtil: aslSession " + session.getUsername() + " " + + session.getScope()); + + return session; + + } + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCaller.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCaller.java new file mode 100644 index 0000000..e4c0817 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/AccountingCaller.java @@ -0,0 +1,149 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice; + +import java.util.List; + +import org.gcube.accounting.analytics.Info; +import org.gcube.accounting.analytics.persistence.AccountingPersistenceQuery; +import org.gcube.accounting.analytics.persistence.AccountingPersistenceQueryFactory; +import org.gcube.portlets.admin.accountingmanager.server.amservice.query.AccountingQuery; +import org.gcube.portlets.admin.accountingmanager.server.amservice.query.AccountingQuery4Job; +import org.gcube.portlets.admin.accountingmanager.server.amservice.query.AccountingQuery4Portlet; +import org.gcube.portlets.admin.accountingmanager.server.amservice.query.AccountingQuery4Service; +import org.gcube.portlets.admin.accountingmanager.server.amservice.query.AccountingQuery4Storage; +import org.gcube.portlets.admin.accountingmanager.server.amservice.query.AccountingQuery4Task; +import org.gcube.portlets.admin.accountingmanager.server.amservice.query.AccountingQueryBuilder; +import org.gcube.portlets.admin.accountingmanager.server.amservice.query.AccountingQueryDirector; +import org.gcube.portlets.admin.accountingmanager.server.amservice.response.SeriesResponse4Job; +import org.gcube.portlets.admin.accountingmanager.server.amservice.response.SeriesResponse4Portlet; +import org.gcube.portlets.admin.accountingmanager.server.amservice.response.SeriesResponse4Service; +import org.gcube.portlets.admin.accountingmanager.server.amservice.response.SeriesResponse4Storage; +import org.gcube.portlets.admin.accountingmanager.server.amservice.response.SeriesResponse4Task; +import org.gcube.portlets.admin.accountingmanager.server.amservice.response.SeriesResponseBuilder; +import org.gcube.portlets.admin.accountingmanager.server.amservice.response.SeriesResponseDirector; +import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingType; +import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesRequest; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesResponse; +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * + * @author giancarlo email: g.panichi@isti.cnr.it + * + */ +public class AccountingCaller { + private static Logger logger = LoggerFactory + .getLogger(AccountingCaller.class); + + public AccountingCaller() { + + } + + public SeriesResponse getSeries(AccountingType accountingType, + SeriesRequest seriesRequest) + throws AccountingManagerServiceException { + try { + logger.debug("getSeries(): [AccountingType="+accountingType+" , seriesRequest=" + seriesRequest+"]"); + AccountingPersistenceQuery apq = AccountingPersistenceQueryFactory + .getInstance(); + + AccountingQueryBuilder queryBuilder = getAccountQueryBuilder( + accountingType, seriesRequest); + + AccountingQueryDirector director = new AccountingQueryDirector(); + director.setAccountingQueryBuilder(queryBuilder); + director.constructAccountingQuery(); + AccountingQuery query = director.getAccountingQuery(); + + if (query == null) { + throw new AccountingManagerServiceException( + "Error in invocation: Operation not supported"); + } + + List infos = apq.query(query.getType(), + query.getTemporalConstraint(), null); + if (infos == null) { + throw new AccountingManagerServiceException( + "Error retrieving list of info: list is null!"); + } + logger.debug("Retrived Infos"); + + SeriesResponseBuilder seriesResponseBuilder = getSeriesResponseBuilder( + accountingType, infos); + + SeriesResponseDirector seriesResponseDirector = new SeriesResponseDirector(); + seriesResponseDirector + .setSeriesResponseBuilder(seriesResponseBuilder); + seriesResponseDirector.constructSeriesResponse(); + SeriesResponse seriesResponse = seriesResponseDirector + .getSeriesResponse(); + + if (seriesResponse == null) { + throw new AccountingManagerServiceException( + "Error creating series response!"); + } + + return seriesResponse; + } catch (Throwable e) { + logger.error("Error in GetSeries(): " + e.getLocalizedMessage()); + e.printStackTrace(); + throw new AccountingManagerServiceException(e.getLocalizedMessage()); + + } + } + + private AccountingQueryBuilder getAccountQueryBuilder( + AccountingType accountingType, SeriesRequest seriesRequest) + throws AccountingManagerServiceException { + if (accountingType == null) { + throw new AccountingManagerServiceException( + "Error accounting type is null"); + } + + switch (accountingType) { + case JOB: + return new AccountingQuery4Job(seriesRequest); + case PORTLET: + return new AccountingQuery4Portlet(seriesRequest); + case SERVICE: + return new AccountingQuery4Service(seriesRequest); + case STORAGE: + return new AccountingQuery4Storage(seriesRequest); + case TASK: + return new AccountingQuery4Task(seriesRequest); + default: + throw new AccountingManagerServiceException( + "Error request type is unknow!"); + + } + } + + private SeriesResponseBuilder getSeriesResponseBuilder( + AccountingType accountingType, List infos) + throws AccountingManagerServiceException { + if (accountingType == null) { + throw new AccountingManagerServiceException( + "Error accounting type is null"); + } + + switch (accountingType) { + case JOB: + return new SeriesResponse4Job(infos); + case PORTLET: + return new SeriesResponse4Portlet(infos); + case SERVICE: + return new SeriesResponse4Service(infos); + case STORAGE: + return new SeriesResponse4Storage(infos); + case TASK: + return new SeriesResponse4Task(infos); + default: + throw new AccountingManagerServiceException( + "Error request type is unknow!"); + + } + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/PeriodModeMap.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/PeriodModeMap.java new file mode 100644 index 0000000..d8512a0 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/PeriodModeMap.java @@ -0,0 +1,59 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice; + +import org.gcube.accounting.analytics.TemporalConstraint.AggregationMode; +import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingPeriodMode; + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public class PeriodModeMap { + + public static AggregationMode getMode(AccountingPeriodMode mode){ + switch(mode){ + case DAILY: + return AggregationMode.DAILY; + case HOURLY: + return AggregationMode.HOURLY; + case MILLISECONDLY: + return AggregationMode.MILLISECONDLY; + case MINUTELY: + return AggregationMode.MINUTELY; + case MONTHLY: + return AggregationMode.MONTHLY; + case SECONDLY: + return AggregationMode.SECONDLY; + case YEARLY: + return AggregationMode.YEARLY; + default: + return AggregationMode.YEARLY; + + } + } + + + public static AccountingPeriodMode getMode(AggregationMode mode){ + switch(mode){ + case DAILY: + return AccountingPeriodMode.DAILY; + case HOURLY: + return AccountingPeriodMode.HOURLY; + case MILLISECONDLY: + return AccountingPeriodMode.MILLISECONDLY; + case MINUTELY: + return AccountingPeriodMode.MINUTELY; + case MONTHLY: + return AccountingPeriodMode.MONTHLY; + case SECONDLY: + return AccountingPeriodMode.SECONDLY; + case YEARLY: + return AccountingPeriodMode.YEARLY; + default: + return AccountingPeriodMode.YEARLY; + + } + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery.java new file mode 100644 index 0000000..8d2db7e --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery.java @@ -0,0 +1,59 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice.query; + +import org.gcube.accounting.analytics.TemporalConstraint; +import org.gcube.accounting.datamodel.SingleUsageRecord; + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public class AccountingQuery { + + private Class type; + private TemporalConstraint temporalConstraint; + + + public AccountingQuery(Class type, TemporalConstraint temporalConstraint) { + super(); + this.type = type; + this.temporalConstraint = temporalConstraint; + } + + + public Class getType() { + return type; + } + + + public void setType(Class type) { + this.type = type; + } + + + public TemporalConstraint getTemporalConstraint() { + return temporalConstraint; + } + + + public void setTemporalConstraint(TemporalConstraint temporalConstraint) { + this.temporalConstraint = temporalConstraint; + } + + + @Override + public String toString() { + return "AccountingQuery [type=" + type + ", temporalConstraint=" + + temporalConstraint + "]"; + } + + + + + + + + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Job.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Job.java new file mode 100644 index 0000000..ca617fa --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Job.java @@ -0,0 +1,42 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice.query; + +import org.gcube.accounting.analytics.TemporalConstraint; +import org.gcube.accounting.datamodel.usagerecords.JobUsageRecord; +import org.gcube.portlets.admin.accountingmanager.server.amservice.PeriodModeMap; +import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesRequest; +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Accounting Query 4 Job + * + * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * + */ +public class AccountingQuery4Job extends AccountingQueryBuilder { + protected static Logger logger = LoggerFactory + .getLogger(AccountingQuery4Job.class); + private SeriesRequest seriesRequest; + + public AccountingQuery4Job(SeriesRequest seriesRequest) { + this.seriesRequest = seriesRequest; + } + + @Override + public void buildOpEx() throws AccountingManagerServiceException { + + TemporalConstraint temporalConstraint = new TemporalConstraint( + seriesRequest.getAccountingPeriod().getStartDate().getTime(), + seriesRequest.getAccountingPeriod().getEndDate().getTime(), + PeriodModeMap.getMode(seriesRequest.getAccountingPeriod() + .getPeriod())); + + AccountingQuery invocation = new AccountingQuery( + JobUsageRecord.class, temporalConstraint); + + accountingQuerySpec.setOp(invocation); + + } +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Portlet.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Portlet.java new file mode 100644 index 0000000..df5828e --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Portlet.java @@ -0,0 +1,42 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice.query; + +import org.gcube.accounting.analytics.TemporalConstraint; +import org.gcube.accounting.datamodel.usagerecords.PortletUsageRecord; +import org.gcube.portlets.admin.accountingmanager.server.amservice.PeriodModeMap; +import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesRequest; +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Accounting Query 4 Portlet + * + * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * + */ +public class AccountingQuery4Portlet extends AccountingQueryBuilder { + protected static Logger logger = LoggerFactory + .getLogger(AccountingQuery4Portlet.class); + private SeriesRequest seriesRequest; + + public AccountingQuery4Portlet(SeriesRequest seriesRequest) { + this.seriesRequest = seriesRequest; + } + + @Override + public void buildOpEx() throws AccountingManagerServiceException { + + TemporalConstraint temporalConstraint = new TemporalConstraint( + seriesRequest.getAccountingPeriod().getStartDate().getTime(), + seriesRequest.getAccountingPeriod().getEndDate().getTime(), + PeriodModeMap.getMode(seriesRequest.getAccountingPeriod() + .getPeriod())); + + AccountingQuery invocation = new AccountingQuery( + PortletUsageRecord.class, temporalConstraint); + + accountingQuerySpec.setOp(invocation); + + } +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Service.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Service.java new file mode 100644 index 0000000..d819b43 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Service.java @@ -0,0 +1,42 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice.query; + +import org.gcube.accounting.analytics.TemporalConstraint; +import org.gcube.accounting.datamodel.usagerecords.ServiceUsageRecord; +import org.gcube.portlets.admin.accountingmanager.server.amservice.PeriodModeMap; +import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesRequest; +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Accounting Query 4 Service + * + * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * + */ +public class AccountingQuery4Service extends AccountingQueryBuilder { + protected static Logger logger = LoggerFactory + .getLogger(AccountingQuery4Service.class); + private SeriesRequest seriesRequest; + + public AccountingQuery4Service(SeriesRequest seriesRequest) { + this.seriesRequest = seriesRequest; + } + + @Override + public void buildOpEx() throws AccountingManagerServiceException { + + TemporalConstraint temporalConstraint = new TemporalConstraint( + seriesRequest.getAccountingPeriod().getStartDate().getTime(), + seriesRequest.getAccountingPeriod().getEndDate().getTime(), + PeriodModeMap.getMode(seriesRequest.getAccountingPeriod() + .getPeriod())); + + AccountingQuery invocation = new AccountingQuery( + ServiceUsageRecord.class, temporalConstraint); + + accountingQuerySpec.setOp(invocation); + + } +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Storage.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Storage.java new file mode 100644 index 0000000..8bbff0a --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Storage.java @@ -0,0 +1,42 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice.query; + +import org.gcube.accounting.analytics.TemporalConstraint; +import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord; +import org.gcube.portlets.admin.accountingmanager.server.amservice.PeriodModeMap; +import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesRequest; +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Accounting Query 4 Storage + * + * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * + */ +public class AccountingQuery4Storage extends AccountingQueryBuilder { + protected static Logger logger = LoggerFactory + .getLogger(AccountingQuery4Storage.class); + private SeriesRequest seriesRequest; + + public AccountingQuery4Storage(SeriesRequest seriesRequest) { + this.seriesRequest = seriesRequest; + } + + @Override + public void buildOpEx() throws AccountingManagerServiceException { + + TemporalConstraint temporalConstraint = new TemporalConstraint( + seriesRequest.getAccountingPeriod().getStartDate().getTime(), + seriesRequest.getAccountingPeriod().getEndDate().getTime(), + PeriodModeMap.getMode(seriesRequest.getAccountingPeriod() + .getPeriod())); + + AccountingQuery invocation = new AccountingQuery( + StorageUsageRecord.class, temporalConstraint); + + accountingQuerySpec.setOp(invocation); + + } +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Task.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Task.java new file mode 100644 index 0000000..a6ee56e --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuery4Task.java @@ -0,0 +1,42 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice.query; + +import org.gcube.accounting.analytics.TemporalConstraint; +import org.gcube.accounting.datamodel.usagerecords.StorageUsageRecord; +import org.gcube.portlets.admin.accountingmanager.server.amservice.PeriodModeMap; +import org.gcube.portlets.admin.accountingmanager.shared.data.query.SeriesRequest; +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Accounting Query 4 Task + * + * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * + */ +public class AccountingQuery4Task extends AccountingQueryBuilder { + protected static Logger logger = LoggerFactory + .getLogger(AccountingQuery4Task.class); + private SeriesRequest seriesRequest; + + public AccountingQuery4Task(SeriesRequest seriesRequest) { + this.seriesRequest = seriesRequest; + } + + @Override + public void buildOpEx() throws AccountingManagerServiceException { + + TemporalConstraint temporalConstraint = new TemporalConstraint( + seriesRequest.getAccountingPeriod().getStartDate().getTime(), + seriesRequest.getAccountingPeriod().getEndDate().getTime(), + PeriodModeMap.getMode(seriesRequest.getAccountingPeriod() + .getPeriod())); + + AccountingQuery invocation = new AccountingQuery( + StorageUsageRecord.class, temporalConstraint); + + accountingQuerySpec.setOp(invocation); + + } +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryBuilder.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryBuilder.java new file mode 100644 index 0000000..b7ce1ad --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryBuilder.java @@ -0,0 +1,26 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice.query; + +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException; + +/** + * Abstract class for build Accounting Query + * + * @author "Giancarlo Panichi" + * email: g.panichi@isti.cnr.it + * + */ +public abstract class AccountingQueryBuilder { + protected AccountingQuerySpec accountingQuerySpec; + + public AccountingQuerySpec getAccountingQuerySpec(){ + return accountingQuerySpec; + } + public void createSpec(){ + accountingQuerySpec=new AccountingQuerySpec(); + + } + + public abstract void buildOpEx() throws AccountingManagerServiceException; + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryDirector.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryDirector.java new file mode 100644 index 0000000..220b2a1 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQueryDirector.java @@ -0,0 +1,38 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice.query; + +import java.util.ArrayList; + +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException; + + +/** + * Accounting Query Director + * + * @author "Giancarlo Panichi" + * email: g.panichi@isti.cnr.it + * + */ +public class AccountingQueryDirector { + AccountingQueryBuilder accountingQueryBuilder; + + public void setAccountingQueryBuilder( + AccountingQueryBuilder accountingQueryBuilder) { + this.accountingQueryBuilder = accountingQueryBuilder; + } + + public AccountingQuery getAccountingQuery() { + return accountingQueryBuilder.getAccountingQuerySpec().getOp(); + + } + + public ArrayList getListOfAccountingQuery() { + return accountingQueryBuilder.getAccountingQuerySpec().getOps(); + + } + + public void constructAccountingQuery() throws AccountingManagerServiceException { + accountingQueryBuilder.createSpec(); + accountingQueryBuilder.buildOpEx(); + + } +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuerySpec.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuerySpec.java new file mode 100644 index 0000000..86cc6df --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/query/AccountingQuerySpec.java @@ -0,0 +1,32 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice.query; + +import java.util.ArrayList; + +/** + * Accounting Query Specification + * + * @author "Giancarlo Panichi" + * email: g.panichi@isti.cnr.it + * + */ +public class AccountingQuerySpec { + private AccountingQuery op; + private ArrayList ops; + + public AccountingQuery getOp() { + return op; + } + + public void setOp(AccountingQuery op) { + this.op = op; + } + + public ArrayList getOps() { + return ops; + } + + public void setOps(ArrayList ops) { + this.ops = ops; + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Job.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Job.java new file mode 100644 index 0000000..b15f7b7 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Job.java @@ -0,0 +1,37 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice.response; + +import java.util.List; + +import org.gcube.accounting.analytics.Info; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesResponse; +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Series Response 4 Job + * + * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * + */ +public class SeriesResponse4Job extends SeriesResponseBuilder { + protected static Logger logger = LoggerFactory + .getLogger(SeriesResponse4Job.class); + private List infos; + + public SeriesResponse4Job(List infos) { + this.infos=infos; + } + + @Override + public void buildSeriesResponse() throws AccountingManagerServiceException { + logger.debug("Infos: "+infos); + + + SeriesResponse seriesResponse = new SeriesResponse(); + + seriesResponseSpec.setSr(seriesResponse); + + } +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Portlet.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Portlet.java new file mode 100644 index 0000000..35c8de7 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Portlet.java @@ -0,0 +1,38 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice.response; + +import java.util.List; + +import org.gcube.accounting.analytics.Info; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesResponse; +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Series Response 4 Portlet + * + * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * + */ +public class SeriesResponse4Portlet extends SeriesResponseBuilder { + protected static Logger logger = LoggerFactory + .getLogger(SeriesResponse4Portlet.class); + + private List infos; + + public SeriesResponse4Portlet(List infos) { + this.infos=infos; + } + + @Override + public void buildSeriesResponse() throws AccountingManagerServiceException { + logger.debug("Infos: "+infos); + + + SeriesResponse seriesResponse = new SeriesResponse(); + + seriesResponseSpec.setSr(seriesResponse); + + } +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Service.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Service.java new file mode 100644 index 0000000..3c73e93 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Service.java @@ -0,0 +1,61 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice.response; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import org.gcube.accounting.aggregation.ServiceUsageRecord; +import org.gcube.accounting.analytics.Info; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesService; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesServiceData; +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException; +import org.json.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Series Response 4 Service + * + * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * + */ +public class SeriesResponse4Service extends SeriesResponseBuilder { + protected static Logger logger = LoggerFactory + .getLogger(SeriesResponse4Service.class); + private List infos; + + public SeriesResponse4Service(List infos) { + this.infos=infos; + } + + @Override + public void buildSeriesResponse() throws AccountingManagerServiceException { + try { + logger.debug("Infos: " + infos); + + ArrayList series=new ArrayList(); + for (Info info : infos) { + Date date = info.getDate(); + JSONObject jso = info.getValue(); + Long duration = jso.getLong(ServiceUsageRecord.DURATION); + Long operationCount = jso + .getLong(ServiceUsageRecord.OPERATION_COUNT); + Long maxInvocationTime = jso.getLong(ServiceUsageRecord.MAX_INVOCATION_TIME); + Long minInvocationTime = jso.getLong(ServiceUsageRecord.MIN_INVOCATION_TIME); + + series.add(new SeriesServiceData(date, operationCount, duration, maxInvocationTime, minInvocationTime)); + + } + + SeriesService seriesService = new SeriesService(series); + + seriesResponseSpec.setSr(seriesService); + } catch (Throwable e) { + logger.error("Error creating series for service accounting: "+e.getLocalizedMessage()); + e.printStackTrace(); + throw new AccountingManagerServiceException("Error creating series for service accounting: "+e.getLocalizedMessage()); + } + + } +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Storage.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Storage.java new file mode 100644 index 0000000..2510fbb --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Storage.java @@ -0,0 +1,57 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice.response; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import org.gcube.accounting.aggregation.StorageUsageRecord; +import org.gcube.accounting.analytics.Info; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesStorage; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesStorageData; +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException; +import org.json.JSONObject; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Series Response 4 Storage + * + * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * + */ +public class SeriesResponse4Storage extends SeriesResponseBuilder { + protected static Logger logger = LoggerFactory + .getLogger(SeriesResponse4Storage.class); + private List infos; + + public SeriesResponse4Storage(List infos) { + this.infos = infos; + } + + @Override + public void buildSeriesResponse() throws AccountingManagerServiceException { + try { + logger.debug("Infos: " + infos); + + ArrayList series=new ArrayList(); + for (Info info : infos) { + Date date = info.getDate(); + JSONObject jso = info.getValue(); + Long dataVolume = jso.getLong(StorageUsageRecord.DATA_VOLUME); + Long operationCount = jso + .getLong(StorageUsageRecord.OPERATION_COUNT); + series.add(new SeriesStorageData(date, dataVolume, operationCount)); + + } + + SeriesStorage seriesStorage = new SeriesStorage(series); + + seriesResponseSpec.setSr(seriesStorage); + } catch (Throwable e) { + logger.error("Error creating series for storage accounting: "+e.getLocalizedMessage()); + e.printStackTrace(); + throw new AccountingManagerServiceException("Error creating series for storage accounting: "+e.getLocalizedMessage()); + } + } +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Task.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Task.java new file mode 100644 index 0000000..357277e --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponse4Task.java @@ -0,0 +1,37 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice.response; + +import java.util.List; + +import org.gcube.accounting.analytics.Info; +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesResponse; +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Series Response 4 Task + * + * @author "Giancarlo Panichi" email: g.panichi@isti.cnr.it + * + */ +public class SeriesResponse4Task extends SeriesResponseBuilder { + protected static Logger logger = LoggerFactory + .getLogger(SeriesResponse4Task.class); + private List infos; + + public SeriesResponse4Task(List infos) { + this.infos=infos; + } + + @Override + public void buildSeriesResponse() throws AccountingManagerServiceException { + logger.debug("Infos: "+infos); + + + SeriesResponse seriesResponse = new SeriesResponse(); + + seriesResponseSpec.setSr(seriesResponse); + + } +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseBuilder.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseBuilder.java new file mode 100644 index 0000000..2950c93 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseBuilder.java @@ -0,0 +1,26 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice.response; + +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException; + +/** + * Abstract class for build Series Response + * + * @author "Giancarlo Panichi" + * email: g.panichi@isti.cnr.it + * + */ +public abstract class SeriesResponseBuilder { + protected SeriesResponseSpec seriesResponseSpec; + + public SeriesResponseSpec getSeriesResponseSpec(){ + return seriesResponseSpec; + } + public void createSpec(){ + seriesResponseSpec=new SeriesResponseSpec(); + + } + + public abstract void buildSeriesResponse() throws AccountingManagerServiceException; + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseDirector.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseDirector.java new file mode 100644 index 0000000..bc8927c --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseDirector.java @@ -0,0 +1,39 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice.response; + +import java.util.ArrayList; + +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesResponse; +import org.gcube.portlets.admin.accountingmanager.shared.exception.AccountingManagerServiceException; + + +/** + * Series Response Director + * + * @author "Giancarlo Panichi" + * email: g.panichi@isti.cnr.it + * + */ +public class SeriesResponseDirector { + SeriesResponseBuilder seriesResponseBuilder; + + public void setSeriesResponseBuilder( + SeriesResponseBuilder seriesResponseBuilder) { + this.seriesResponseBuilder = seriesResponseBuilder; + } + + public SeriesResponse getSeriesResponse() { + return seriesResponseBuilder.getSeriesResponseSpec().getSr(); + + } + + public ArrayList getListOfSeriesResponse() { + return seriesResponseBuilder.getSeriesResponseSpec().getSrs(); + + } + + public void constructSeriesResponse() throws AccountingManagerServiceException { + seriesResponseBuilder.createSpec(); + seriesResponseBuilder.buildSeriesResponse(); + + } +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseSpec.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseSpec.java new file mode 100644 index 0000000..546f63a --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/amservice/response/SeriesResponseSpec.java @@ -0,0 +1,34 @@ +package org.gcube.portlets.admin.accountingmanager.server.amservice.response; + +import java.util.ArrayList; + +import org.gcube.portlets.admin.accountingmanager.shared.data.response.SeriesResponse; + +/** + * Series Response Specification + * + * @author "Giancarlo Panichi" + * email: g.panichi@isti.cnr.it + * + */ +public class SeriesResponseSpec { + private SeriesResponse sr; + private ArrayList srs; + + public SeriesResponse getSr() { + return sr; + } + + public void setSr(SeriesResponse sr) { + this.sr = sr; + } + + public ArrayList getSrs() { + return srs; + } + + public void setSrs(ArrayList srs) { + this.srs = srs; + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/server/portlet/AccountingManagerPortlet.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/portlet/AccountingManagerPortlet.java new file mode 100644 index 0000000..465ed6f --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/server/portlet/AccountingManagerPortlet.java @@ -0,0 +1,55 @@ +/** + * + */ +package org.gcube.portlets.admin.accountingmanager.server.portlet; + +import java.io.IOException; + +import javax.portlet.GenericPortlet; +import javax.portlet.PortletException; +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; + +import org.gcube.portal.custom.scopemanager.scopehelper.ScopeHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * @author Federico De Faveri defaveri@isti.cnr.it + * + */ +public class AccountingManagerPortlet extends GenericPortlet { + + protected Logger logger = LoggerFactory.getLogger(AccountingManagerPortlet.class); + + + /** + * JSP folder name + */ + public static final String JSP_FOLDER = "/WEB-INF/jsp/"; + + /** + * + */ + public static final String VIEW_JSP = JSP_FOLDER + "AccountingManagerPortlet_view.jsp"; + + /** + * @param request . + * @param response . + * @throws IOException . + * @throws PortletException . + */ + public void doView(RenderRequest request, RenderResponse response) throws PortletException, IOException { + + logger.trace("TabularDataPortlet loading from JSP: "+VIEW_JSP); + + logger.trace("setting context using ScopeHelper"); + ScopeHelper.setContext(request); + + logger.trace("passing to the render"); + PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher(VIEW_JSP); + logger.trace("Call: "+VIEW_JSP); + rd.include(request,response); + } +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/Constants.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/Constants.java new file mode 100644 index 0000000..61f1851 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/Constants.java @@ -0,0 +1,20 @@ +package org.gcube.portlets.admin.accountingmanager.shared; + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public class Constants { + + public static final String APPLICATION_ID = "org.gcube.portlets.admin.accountingmanager.server.portlet.AccountingManagerPortlet"; + public static final String ACCOUNTING_MANAGER_ID = "AccountingManagerId"; + public static final String AM_LANG_COOKIE = "AMLangCookie"; + public static final String AM_LANG = "AMLang"; + public final static String DEFAULT_USER = "test.user"; + public final static String DEFAULT_SCOPE = "/gcube/devNext"; + //public final static String DEFAULT_SCOPE = "/gcube/devsec/devVRE"; + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingPeriod.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingPeriod.java new file mode 100644 index 0000000..8a81387 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingPeriod.java @@ -0,0 +1,65 @@ +package org.gcube.portlets.admin.accountingmanager.shared.data; + +import java.io.Serializable; +import java.util.Date; + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public class AccountingPeriod implements Serializable { + + private static final long serialVersionUID = 4241461469179338817L; + + private Date startDate; + private Date endDate; + private AccountingPeriodMode period; + + public AccountingPeriod(){ + super(); + } + + public AccountingPeriod(Date startDate, Date endDate, + AccountingPeriodMode period) { + super(); + this.startDate = startDate; + this.endDate = endDate; + this.period = period; + } + + public Date getStartDate() { + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + public AccountingPeriodMode getPeriod() { + return period; + } + + public void setPeriod(AccountingPeriodMode period) { + this.period = period; + } + + @Override + public String toString() { + return "AccountingPeriod [startDate=" + startDate + ", endDate=" + + endDate + ", period=" + period + "]"; + } + + + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingPeriodMode.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingPeriodMode.java new file mode 100644 index 0000000..48fcf10 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingPeriodMode.java @@ -0,0 +1,71 @@ +package org.gcube.portlets.admin.accountingmanager.shared.data; + +import java.util.Arrays; +import java.util.List; + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public enum AccountingPeriodMode { + YEARLY("Yearly"), + MONTHLY("Monthly"), + DAILY("Dayly"), + HOURLY("Hourly"), + MINUTELY("Minutely"), + SECONDLY("Secondly"), + MILLISECONDLY("Per Millisecond"); + + + /** + * @param text + */ + private AccountingPeriodMode(final String id) { + this.id = id; + } + + private final String id; + + @Override + public String toString() { + return id; + } + + public String getLabel() { + return id; + } + + public String getId(){ + return id; + } + + + /** + * + * @param id + * @return + */ + public static AccountingPeriodMode getAccountingPeriodModeFromId(String id) { + if(id==null||id.isEmpty()) return null; + + for (AccountingPeriodMode columnDataType : values()) { + if (columnDataType.id.compareToIgnoreCase(id) == 0) { + return columnDataType; + } + } + return null; + } + + /** + * + * @return + */ + public static List asList() { + List list=Arrays.asList(values()); + return list; + } + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingType.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingType.java new file mode 100644 index 0000000..9f1145c --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/AccountingType.java @@ -0,0 +1,19 @@ +/** + * + */ +package org.gcube.portlets.admin.accountingmanager.shared.data; + +/** + * + * @author "Giancarlo Panichi" + * g.panichi@isti.cnr.it + * + */ +public enum AccountingType { + STORAGE, + SERVICE, + PORTLET, + TASK, + JOB; + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/query/SeriesRequest.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/query/SeriesRequest.java new file mode 100644 index 0000000..c044692 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/query/SeriesRequest.java @@ -0,0 +1,44 @@ +package org.gcube.portlets.admin.accountingmanager.shared.data.query; + +import java.io.Serializable; + +import org.gcube.portlets.admin.accountingmanager.shared.data.AccountingPeriod; + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public class SeriesRequest implements Serializable { + + private static final long serialVersionUID = -109538024097615414L; + private AccountingPeriod accountingPeriod; + + public SeriesRequest() { + super(); + } + + public SeriesRequest(AccountingPeriod accountingPeriod) { + super(); + this.accountingPeriod = accountingPeriod; + } + + public AccountingPeriod getAccountingPeriod() { + return accountingPeriod; + } + + public void setAccountingPeriod(AccountingPeriod accountingPeriod) { + this.accountingPeriod = accountingPeriod; + } + + + @Override + public String toString() { + return "SeriesRequest [accountingPeriod=" + accountingPeriod + "]"; + } + + + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesJob.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesJob.java new file mode 100644 index 0000000..eb6a19d --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesJob.java @@ -0,0 +1,46 @@ +package org.gcube.portlets.admin.accountingmanager.shared.data.response; + +import java.util.ArrayList; + + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public class SeriesJob extends SeriesResponse { + + private static final long serialVersionUID = 8054723198014713937L; + + ArrayList series; + + public SeriesJob(){ + super(); + } + + public SeriesJob(ArrayList series) { + super(); + this.series = series; + } + + public ArrayList getSeries() { + return series; + } + + public void setSeries(ArrayList series) { + this.series = series; + } + + @Override + public String toString() { + return "SeriesJob [series=" + series + "]"; + } + + + + + + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesJobData.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesJobData.java new file mode 100644 index 0000000..580b24b --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesJobData.java @@ -0,0 +1,53 @@ +package org.gcube.portlets.admin.accountingmanager.shared.data.response; + +import java.io.Serializable; +import java.util.Date; + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public class SeriesJobData implements Serializable { + + private static final long serialVersionUID = 2082599366859724992L; + private Date date; + private Long operationCount; + + public SeriesJobData(){ + super(); + } + + public SeriesJobData(Date date, Long operationCount) { + super(); + this.date = date; + this.operationCount = operationCount; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public Long getOperationCount() { + return operationCount; + } + + public void setOperationCount(Long operationCount) { + this.operationCount = operationCount; + } + + @Override + public String toString() { + return "SeriesJobData [date=" + date + ", operationCount=" + + operationCount + "]"; + } + + + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesPortlet.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesPortlet.java new file mode 100644 index 0000000..78a78d9 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesPortlet.java @@ -0,0 +1,39 @@ +package org.gcube.portlets.admin.accountingmanager.shared.data.response; + +import java.util.ArrayList; + +/** + * + * @author giancarlo email: g.panichi@isti.cnr.it + * + */ +public class SeriesPortlet extends SeriesResponse { + + private static final long serialVersionUID = -1215710427019099089L; + + ArrayList series; + + public SeriesPortlet() { + super(); + } + + public SeriesPortlet(ArrayList series) { + super(); + this.series = series; + } + + public ArrayList getSeries() { + return series; + } + + public void setSeries(ArrayList series) { + this.series = series; + } + + @Override + public String toString() { + return "SeriesPortlet [series=" + series + "]"; + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesPortletData.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesPortletData.java new file mode 100644 index 0000000..a8f6b32 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesPortletData.java @@ -0,0 +1,52 @@ +package org.gcube.portlets.admin.accountingmanager.shared.data.response; + +import java.io.Serializable; +import java.util.Date; + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public class SeriesPortletData implements Serializable { + + private static final long serialVersionUID = -4812847957210767836L; + private Date date; + private Long operationCount; + + public SeriesPortletData(){ + super(); + } + + public SeriesPortletData(Date date, Long operationCount) { + super(); + this.date = date; + this.operationCount = operationCount; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public Long getOperationCount() { + return operationCount; + } + + public void setOperationCount(Long operationCount) { + this.operationCount = operationCount; + } + + @Override + public String toString() { + return "SeriesPortletData [date=" + date + ", operationCount=" + + operationCount + "]"; + } + + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesResponse.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesResponse.java new file mode 100644 index 0000000..d4f3fcd --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesResponse.java @@ -0,0 +1,19 @@ +package org.gcube.portlets.admin.accountingmanager.shared.data.response; + +import java.io.Serializable; + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public class SeriesResponse implements Serializable{ + + private static final long serialVersionUID = -2746968605225884841L; + + public SeriesResponse(){ + super(); + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesService.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesService.java new file mode 100644 index 0000000..72fb6b6 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesService.java @@ -0,0 +1,43 @@ +package org.gcube.portlets.admin.accountingmanager.shared.data.response; + +import java.util.ArrayList; + + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public class SeriesService extends SeriesResponse { + + private static final long serialVersionUID = -1311805875898959881L; + ArrayList series; + + + public SeriesService(){ + super(); + } + + public SeriesService(ArrayList series) { + super(); + this.series = series; + } + + public ArrayList getSeries() { + return series; + } + + public void setSeries(ArrayList series) { + this.series = series; + } + + @Override + public String toString() { + return "SeriesService [series=" + series + "]"; + } + + + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesServiceData.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesServiceData.java new file mode 100644 index 0000000..2846f1c --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesServiceData.java @@ -0,0 +1,83 @@ +package org.gcube.portlets.admin.accountingmanager.shared.data.response; + +import java.io.Serializable; +import java.util.Date; + +/** + * + * @author giancarlo email: g.panichi@isti.cnr.it + * + */ +public class SeriesServiceData implements Serializable { + + private static final long serialVersionUID = -8322187634378176470L; + private Date date; + private Long operationCount; + private Long duration; + private Long maxInvocationTime; + private Long minInvocationTime; + + public SeriesServiceData() { + super(); + } + + public SeriesServiceData(Date date, Long operationCount, Long duration, + Long maxInvocationTime, Long minInvocationTime) { + super(); + this.date = date; + this.operationCount = operationCount; + this.duration = duration; + this.maxInvocationTime = maxInvocationTime; + this.minInvocationTime = minInvocationTime; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public Long getOperationCount() { + return operationCount; + } + + public void setOperationCount(Long operationCount) { + this.operationCount = operationCount; + } + + public Long getDuration() { + return duration; + } + + public void setDuration(Long duration) { + this.duration = duration; + } + + public Long getMaxInvocationTime() { + return maxInvocationTime; + } + + public void setMaxInvocationTime(Long maxInvocationTime) { + this.maxInvocationTime = maxInvocationTime; + } + + public Long getMinInvocationTime() { + return minInvocationTime; + } + + public void setMinInvocationTime(Long minInvocationTime) { + this.minInvocationTime = minInvocationTime; + } + + @Override + public String toString() { + return "SeriesServiceData [date=" + date + ", operationCount=" + + operationCount + ", duration=" + duration + + ", maxInvocationTime=" + maxInvocationTime + + ", minInvocationTime=" + minInvocationTime + "]"; + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesStorage.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesStorage.java new file mode 100644 index 0000000..8135800 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesStorage.java @@ -0,0 +1,43 @@ +package org.gcube.portlets.admin.accountingmanager.shared.data.response; + +import java.util.ArrayList; + + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public class SeriesStorage extends SeriesResponse { + + ArrayList series; + + private static final long serialVersionUID = 4519497775591158592L; + + public SeriesStorage(){ + super(); + } + + public SeriesStorage(ArrayList series) { + super(); + this.series = series; + } + + public ArrayList getSeries() { + return series; + } + + public void setSeries(ArrayList series) { + this.series = series; + } + + @Override + public String toString() { + return "SeriesStorage [series=" + series + "]"; + } + + + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesStorageData.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesStorageData.java new file mode 100644 index 0000000..66ef9f3 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesStorageData.java @@ -0,0 +1,69 @@ +package org.gcube.portlets.admin.accountingmanager.shared.data.response; + +import java.io.Serializable; +import java.util.Date; + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public class SeriesStorageData implements Serializable { + + private static final long serialVersionUID = -192149405907077352L; + + private Date date; + private Long dataVolume; + private Long operationCount; + + public SeriesStorageData(){ + super(); + } + + /** + * + * @param date + * @param dataVolume + * @param operationCount + */ + public SeriesStorageData(Date date, Long dataVolume, Long operationCount) { + super(); + this.date = date; + this.dataVolume = dataVolume; + this.operationCount = operationCount; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public Long getDataVolume() { + return dataVolume; + } + + public void setDataVolume(Long dataVolume) { + this.dataVolume = dataVolume; + } + + public Long getOperationCount() { + return operationCount; + } + + public void setOperationCount(Long operationCount) { + this.operationCount = operationCount; + } + + @Override + public String toString() { + return "SeriesStorageData [date=" + date + ", dataVolume=" + dataVolume + + ", operationCount=" + operationCount + "]"; + } + + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesTask.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesTask.java new file mode 100644 index 0000000..0802e03 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesTask.java @@ -0,0 +1,39 @@ +package org.gcube.portlets.admin.accountingmanager.shared.data.response; + +import java.util.ArrayList; + +/** + * + * @author giancarlo email: g.panichi@isti.cnr.it + * + */ +public class SeriesTask extends SeriesResponse { + + private static final long serialVersionUID = -1215710427019099089L; + + ArrayList series; + + public SeriesTask() { + super(); + } + + public SeriesTask(ArrayList series) { + super(); + this.series = series; + } + + public ArrayList getSeries() { + return series; + } + + public void setSeries(ArrayList series) { + this.series = series; + } + + @Override + public String toString() { + return "SeriesTask [series=" + series + "]"; + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesTaskData.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesTaskData.java new file mode 100644 index 0000000..a4d3311 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/data/response/SeriesTaskData.java @@ -0,0 +1,50 @@ +package org.gcube.portlets.admin.accountingmanager.shared.data.response; + +import java.io.Serializable; +import java.util.Date; + +/** + * + * @author giancarlo email: g.panichi@isti.cnr.it + * + */ +public class SeriesTaskData implements Serializable { + + private static final long serialVersionUID = -4812847957210767836L; + private Date date; + private Long operationCount; + + public SeriesTaskData() { + super(); + } + + public SeriesTaskData(Date date, Long operationCount) { + super(); + this.date = date; + this.operationCount = operationCount; + } + + public Date getDate() { + return date; + } + + public void setDate(Date date) { + this.date = date; + } + + public Long getOperationCount() { + return operationCount; + } + + public void setOperationCount(Long operationCount) { + this.operationCount = operationCount; + } + + @Override + public String toString() { + return "SeriesTaskData [date=" + date + ", operationCount=" + + operationCount + "]"; + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/exception/AccountingManagerServiceException.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/exception/AccountingManagerServiceException.java new file mode 100644 index 0000000..e0edbc8 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/exception/AccountingManagerServiceException.java @@ -0,0 +1,38 @@ +/** + * + */ +package org.gcube.portlets.admin.accountingmanager.shared.exception; + +/** + * + * @author "Giancarlo Panichi" + * g.panichi@isti.cnr.it + * + */ +public class AccountingManagerServiceException extends Exception { + + + private static final long serialVersionUID = -2255657546267656458L; + + + /** + * + */ + public AccountingManagerServiceException() { + super(); + } + + /** + * @param message + */ + public AccountingManagerServiceException(String message) { + super(message); + } + + + public AccountingManagerServiceException(String message,Throwable t) { + super(message,t); + } + + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/exception/AccountingManagerSessionExpiredException.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/exception/AccountingManagerSessionExpiredException.java new file mode 100644 index 0000000..3479e50 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/exception/AccountingManagerSessionExpiredException.java @@ -0,0 +1,36 @@ +package org.gcube.portlets.admin.accountingmanager.shared.exception; + +/** + * ASL Session Expired Exception + * + * @author "Giancarlo Panichi" + * + */ +public class AccountingManagerSessionExpiredException extends AccountingManagerServiceException { + + private static final long serialVersionUID = -4831171355042165166L; + + /** + * + */ + public AccountingManagerSessionExpiredException() { + super(); + } + + /** + * @param message + */ + public AccountingManagerSessionExpiredException(String message) { + super(message); + } + + /** + * + * @param message + * @param t + */ + public AccountingManagerSessionExpiredException(String message,Throwable t) { + super(message,t); + } + +} diff --git a/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/session/UserInfo.java b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/session/UserInfo.java new file mode 100644 index 0000000..8152674 --- /dev/null +++ b/src/main/java/org/gcube/portlets/admin/accountingmanager/shared/session/UserInfo.java @@ -0,0 +1,114 @@ +package org.gcube.portlets.admin.accountingmanager.shared.session; + +import java.io.Serializable; + +/** + * + * @author giancarlo + * email: g.panichi@isti.cnr.it + * + */ +public class UserInfo implements Serializable { + + private static final long serialVersionUID = -2826549639677017234L; + + private String username; + private long groupId; + private String groupName; + private String scope; + private String scopeName; + private String userEmailAddress; + private String userFullName; + + public UserInfo() { + super(); + } + + /** + * + * @param username + * @param groupId + * @param groupName + * @param scope + * @param scopeName + * @param userEmailAddress + * @param userFullName + */ + public UserInfo(String username, long groupId, String groupName, + String scope, String scopeName, String userEmailAddress, + String userFullName) { + super(); + this.username = username; + this.groupId = groupId; + this.groupName = groupName; + this.scope = scope; + this.scopeName = scopeName; + this.userEmailAddress = userEmailAddress; + this.userFullName = userFullName; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public long getGroupId() { + return groupId; + } + + public void setGroupId(long groupId) { + this.groupId = groupId; + } + + public String getGroupName() { + return groupName; + } + + public void setGroupName(String groupName) { + this.groupName = groupName; + } + + public String getScope() { + return scope; + } + + public void setScope(String scope) { + this.scope = scope; + } + + public String getScopeName() { + return scopeName; + } + + public void setScopeName(String scopeName) { + this.scopeName = scopeName; + } + + public String getUserEmailAddress() { + return userEmailAddress; + } + + public void setUserEmailAddress(String userEmailAddress) { + this.userEmailAddress = userEmailAddress; + } + + public String getUserFullName() { + return userFullName; + } + + public void setUserFullName(String userFullName) { + this.userFullName = userFullName; + } + + @Override + public String toString() { + return "UserInfo [username=" + username + ", groupId=" + groupId + + ", groupName=" + groupName + ", scope=" + scope + + ", scopeName=" + scopeName + ", userEmailAddress=" + + userEmailAddress + ", userFullName=" + userFullName + "]"; + } + +} diff --git a/src/main/resources/FARM.gcubekey b/src/main/resources/FARM.gcubekey new file mode 100644 index 0000000..b113201 --- /dev/null +++ b/src/main/resources/FARM.gcubekey @@ -0,0 +1 @@ +< ¬@Qaj¤F€g¸ðQ \ No newline at end of file diff --git a/src/main/resources/devNext.gcubekey b/src/main/resources/devNext.gcubekey new file mode 100644 index 0000000..260f269 --- /dev/null +++ b/src/main/resources/devNext.gcubekey @@ -0,0 +1 @@ +6 4Zð/Uä‰ Cå±ß˜ \ No newline at end of file diff --git a/src/main/resources/devsec.gcubekey b/src/main/resources/devsec.gcubekey new file mode 100644 index 0000000..260f269 --- /dev/null +++ b/src/main/resources/devsec.gcubekey @@ -0,0 +1 @@ +6 4Zð/Uä‰ Cå±ß˜ \ No newline at end of file diff --git a/src/main/resources/gCubeApps.gcubekey b/src/main/resources/gCubeApps.gcubekey new file mode 100644 index 0000000..b113201 --- /dev/null +++ b/src/main/resources/gCubeApps.gcubekey @@ -0,0 +1 @@ +< ¬@Qaj¤F€g¸ðQ \ No newline at end of file diff --git a/src/main/resources/gcube.gcubekey b/src/main/resources/gcube.gcubekey new file mode 100644 index 0000000..260f269 --- /dev/null +++ b/src/main/resources/gcube.gcubekey @@ -0,0 +1 @@ +6 4Zð/Uä‰ Cå±ß˜ \ No newline at end of file diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/AccountingManager.gwt.xml b/src/main/resources/org/gcube/portlets/admin/accountingmanager/AccountingManager.gwt.xml new file mode 100644 index 0000000..f1eb058 --- /dev/null +++ b/src/main/resources/org/gcube/portlets/admin/accountingmanager/AccountingManager.gwt.xml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/i18n/TDMMessages.properties b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/i18n/TDMMessages.properties new file mode 100644 index 0000000..acf6219 --- /dev/null +++ b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/i18n/TDMMessages.properties @@ -0,0 +1 @@ +newRuleTitle = New Rule \ No newline at end of file diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/i18n/TDMMessages_es.properties b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/i18n/TDMMessages_es.properties new file mode 100644 index 0000000..3ead2e4 --- /dev/null +++ b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/i18n/TDMMessages_es.properties @@ -0,0 +1 @@ +newRuleTitle = Nuova Regola \ No newline at end of file diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/i18n/TDMMessages_it.properties b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/i18n/TDMMessages_it.properties new file mode 100644 index 0000000..3ead2e4 --- /dev/null +++ b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/i18n/TDMMessages_it.properties @@ -0,0 +1 @@ +newRuleTitle = Nuova Regola \ No newline at end of file diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManager.css b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManager.css new file mode 100644 index 0000000..57cee7a --- /dev/null +++ b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/AccountingManager.css @@ -0,0 +1,7 @@ +@CHARSET "UTF-8"; + + +.ribbon { + line-height: 13px; + font-size: 11px; +} diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-job_128.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-job_128.png new file mode 100644 index 0000000..ce31db4 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-job_128.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-job_32.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-job_32.png new file mode 100644 index 0000000..86a10b0 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-job_32.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-job_48.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-job_48.png new file mode 100644 index 0000000..e5485a6 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-job_48.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-manager_128.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-manager_128.png new file mode 100644 index 0000000..094380b Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-manager_128.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-manager_32.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-manager_32.png new file mode 100644 index 0000000..a3b5803 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-manager_32.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-manager_48.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-manager_48.png new file mode 100644 index 0000000..19bce4e Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-manager_48.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-portlet_128.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-portlet_128.png new file mode 100644 index 0000000..3c98f92 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-portlet_128.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-portlet_32.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-portlet_32.png new file mode 100644 index 0000000..70f6a54 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-portlet_32.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-portlet_48.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-portlet_48.png new file mode 100644 index 0000000..e1be629 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-portlet_48.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-reload_16.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-reload_16.png new file mode 100644 index 0000000..32ba03c Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-reload_16.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-reload_24.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-reload_24.png new file mode 100644 index 0000000..b08e139 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-reload_24.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-reload_32.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-reload_32.png new file mode 100644 index 0000000..f46779d Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-reload_32.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-service_128.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-service_128.png new file mode 100644 index 0000000..08860fe Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-service_128.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-service_32.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-service_32.png new file mode 100644 index 0000000..cbdb5ba Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-service_32.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-service_48.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-service_48.png new file mode 100644 index 0000000..6337486 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-service_48.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-storage_128.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-storage_128.png new file mode 100644 index 0000000..948c95f Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-storage_128.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-storage_32.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-storage_32.png new file mode 100644 index 0000000..57202d0 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-storage_32.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-storage_48.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-storage_48.png new file mode 100644 index 0000000..b367990 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-storage_48.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-task_128.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-task_128.png new file mode 100644 index 0000000..ef9c320 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-task_128.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-task_32.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-task_32.png new file mode 100644 index 0000000..cf9ccc5 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-task_32.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-task_48.png b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-task_48.png new file mode 100644 index 0000000..5d62f77 Binary files /dev/null and b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/resource/accounting-task_48.png differ diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/AccountingManagerRibbonMessages.properties b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/AccountingManagerRibbonMessages.properties new file mode 100644 index 0000000..888861a --- /dev/null +++ b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/AccountingManagerRibbonMessages.properties @@ -0,0 +1,4 @@ +storage = Storage +job = Job +task = Task +service = Service diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/AccountingManagerRibbonMessages_es.properties b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/AccountingManagerRibbonMessages_es.properties new file mode 100644 index 0000000..888861a --- /dev/null +++ b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/AccountingManagerRibbonMessages_es.properties @@ -0,0 +1,4 @@ +storage = Storage +job = Job +task = Task +service = Service diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/AccountingManagerRibbonMessages_it.properties b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/AccountingManagerRibbonMessages_it.properties new file mode 100644 index 0000000..888861a --- /dev/null +++ b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/AccountingManagerRibbonMessages_it.properties @@ -0,0 +1,4 @@ +storage = Storage +job = Job +task = Task +service = Service diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/StorageToolBarMessages.properties b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/StorageToolBarMessages.properties new file mode 100644 index 0000000..cf36fba --- /dev/null +++ b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/StorageToolBarMessages.properties @@ -0,0 +1,46 @@ +fileGroupHeadingText = Tabular Resource +openButton = Open +openButtonToolTip = Open Tabular Resource +closeButton = Close All +closeButtonToolTip = Close All Tabular Resources +cloneButton = Clone +cloneButtonToolTip = Clone Tabular Resource +shareButton = Share +shareButtonToolTip = Share Tabular Resource +deleteButton = Delete +deleteButtonToolTip = Delete Tabular Resource +propertiesButton = Properties +propertiesButtonToolTip = Show Properties +importGroupHeadingText = Import +importSDMXButton = SDMX +importSDMXButtonToolTip = Import table from SDMX source +importCSVButton = CSV +importCSVButtonToolTip = Import table from CSV source +importJSONButton = JSON +importJSONButtonToolTip = Import table from JSON source +exportGroupHeadingText = Export +exportSDMXButton = SDMX +exportSDMXButtonToolTip = Export SDMX document +exportCSVButton = CSV +exportCSVButtonToolTip = Export CSV document +exportJSONButton = JSON +exportJSONButtonToolTip = Export JSON document +taskGroupHeadingText = Tasks +timelineButton = Timeline +timelineButtonToolTip = Timeline +backgroundButton = Background +backgroundButtonToolTip = Tasks in background +historyGroupHeadingText = History +historyButton = History +historyButtonToolTip = Show history +undoButton = Undo +undoButtonToolTip = Discard last operation +helpGroupHeadingText = Help +helpButton = Help +helpButtonToolTip = Help +languageButton = Language +languageButtonToolTip = Language +english = English +italian = Italian +spanish = Spanish + \ No newline at end of file diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/StorageToolBarMessages_es.properties b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/StorageToolBarMessages_es.properties new file mode 100644 index 0000000..5644403 --- /dev/null +++ b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/StorageToolBarMessages_es.properties @@ -0,0 +1,45 @@ +fileGroupHeadingText = Tabular Resource +openButton = Abre +openButtonToolTip = Abre Tabular Resource +closeButton = Cerca de todo +closeButtonToolTip = Cerrar todas las Tabular Resources +cloneButton = Clon +cloneButtonToolTip = Clon Tabular Resource +shareButton = Cuota +shareButtonToolTip = Cuota la Tabular Resource +deleteButton = Borrar +deleteButtonToolTip = Eliminar la Tabular Resource +propertiesButton = Propiedades +propertiesButtonToolTip = Muestra las propiedades +importGroupHeadingText = Importaciòn +importSDMXButton = SDMX +importSDMXButtonToolTip = Importar una tabla de una fuente SDMX +importCSVButton = CSV +importCSVButtonToolTip = Importar una tabla de una fuente CSV +importJSONButton = JSON +importJSONButtonToolTip = Importar una tabla de una fuente JSON +exportGroupHeadingText = Exportaciòn +exportSDMXButton = SDMX +exportSDMXButtonToolTip = Documento de exportaciòn como SDMX +exportCSVButton = CSV +exportCSVButtonToolTip = Documento de exportaciòn como CSV +exportJSONButton = JSON +exportJSONButtonToolTip = Documento de exportaciòn como JSON +taskGroupHeadingText = Tareas +timelineButton = Timeline +timelineButtonToolTip = Timeline +backgroundButton = Background +backgroundButtonToolTip = Tareas en segundo plano +historyGroupHeadingText = Historia +historyButton = Historia +historyButtonToolTip = Mostrar historial +undoButton = Deshacer +undoButtonToolTip = Olvidese de la ùltima operaciòn +helpGroupHeadingText = Ayuda +helpButton = Ayuda +helpButtonToolTip = Ayuda +languageButton = Idioma +languageButtonToolTip = Idioma +english = Inglés +italian = Italiano +spanish = Español \ No newline at end of file diff --git a/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/StorageToolBarMessages_it.properties b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/StorageToolBarMessages_it.properties new file mode 100644 index 0000000..6dff534 --- /dev/null +++ b/src/main/resources/org/gcube/portlets/admin/accountingmanager/client/ribbon/StorageToolBarMessages_it.properties @@ -0,0 +1,45 @@ +fileGroupHeadingText = Tabular Resource +openButton = Apri +openButtonToolTip = Apri Tabular Resource +closeButton = Chiudi tutto +closeButtonToolTip = Chiudi tutte le Tabular Resources +cloneButton = Clona +cloneButtonToolTip = Clona Tabular Resource +shareButton = Condividi +shareButtonToolTip = Condividi Tabular Resource +deleteButton = Elimina +deleteButtonToolTip = Elimina la Tabular Resource +propertiesButton = Propietà +propertiesButtonToolTip = Mostra Propietà +importGroupHeadingText = Importa +importSDMXButton = SDMX +importSDMXButtonToolTip = Importa una tabella da una sorgente SDMX +importCSVButton = CSV +importCSVButtonToolTip = Importa una tabella da una sorgente CSV +importJSONButton = JSON +importJSONButtonToolTip = Importa una tabella da una sorgente JSON +exportGroupHeadingText = Esporta +exportSDMXButton = SDMX +exportSDMXButtonToolTip = Esporta come documento SDMX +exportCSVButton = CSV +exportCSVButtonToolTip = Esporta come documento CSV +exportJSONButton = JSON +exportJSONButtonToolTip = Esporta come documento JSON +taskGroupHeadingText = Tasks +timelineButton = Timeline +timelineButtonToolTip = Timeline +backgroundButton = Background +backgroundButtonToolTip = Tasks in background +historyGroupHeadingText = Cronologia +historyButton = Cronologia +historyButtonToolTip = Mostra Cronologia +undoButton = Indietro +undoButtonToolTip = Dimentica l''ultima operazione +helpGroupHeadingText = Aiuto +helpButton = Aiuto +helpButtonToolTip = Aiuto +languageButton = Lingua +languageButtonToolTip = Lingua +english = Inglese +italian = Italiano +spanish = Spagnolo \ No newline at end of file diff --git a/src/main/resources/symm.key b/src/main/resources/symm.key new file mode 100644 index 0000000..260f269 --- /dev/null +++ b/src/main/resources/symm.key @@ -0,0 +1 @@ +6 4Zð/Uä‰ Cå±ß˜ \ No newline at end of file diff --git a/src/main/webapp/AccountingManager.css b/src/main/webapp/AccountingManager.css new file mode 100644 index 0000000..22e9a0f --- /dev/null +++ b/src/main/webapp/AccountingManager.css @@ -0,0 +1,7 @@ +/** Add css rules here for your application. */ +/*table { + border-spacing: 1px !important; + top: 0px !important; +}*/ + + diff --git a/src/main/webapp/AccountingManager.html b/src/main/webapp/AccountingManager.html new file mode 100644 index 0000000..f35d361 --- /dev/null +++ b/src/main/webapp/AccountingManager.html @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + +Accounting Manager + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/AccountingManager/js/highcharts-3d.js b/src/main/webapp/AccountingManager/js/highcharts-3d.js new file mode 100644 index 0000000..77f0fcd --- /dev/null +++ b/src/main/webapp/AccountingManager/js/highcharts-3d.js @@ -0,0 +1,46 @@ +/* + Highcharts JS v4.1.7 (2015-06-26) + + (c) 2009-2013 Torstein Hønsi + + License: www.highcharts.com/license +*/ +(function(d){function n(c,a,b){var e,f,g=a.options.chart.options3d,i=!1;b?(i=a.inverted,b=a.plotWidth/2,a=a.plotHeight/2,e=g.depth/2,f=y(g.depth,1)*y(g.viewDistance,0)):(b=a.plotLeft+a.plotWidth/2,a=a.plotTop+a.plotHeight/2,e=g.depth/2,f=y(g.depth,1)*y(g.viewDistance,0));var j=[],h=b,k=a,v=e,p=f,b=x*(i?g.beta:-g.beta),g=x*(i?-g.alpha:g.alpha),q=l(b),s=m(b),t=l(g),u=m(g),w,B,r,n,o,z;d.each(c,function(a){w=(i?a.y:a.x)-h;B=(i?a.x:a.y)-k;r=(a.z||0)-v;n=s*w-q*r;o=-q*t*w-s*t*r+u*B;z=q*u*w+s*u*r+t*B;p>0&& +pf&&g-f>q/2+1.0E-4?(h=h.concat(r(c,a,b,e,f,f+q/2,d,j)),h=h.concat(r(c,a,b,e,f+q/2,g,d,j))):gq/2+1.0E-4? +(h=h.concat(r(c,a,b,e,f,f-q/2,d,j)),h=h.concat(r(c,a,b,e,f-q/2,g,d,j))):(h=g-f,["C",c+b*m(f)-b*A*h*l(f)+d,a+e*l(f)+e*A*h*m(f)+j,c+b*m(g)+b*A*h*l(g)+d,a+e*l(g)-e*A*h*m(g)+j,c+b*m(g)+d,a+e*l(g)+j])}function F(c){if(this.chart.is3d()){var a=this.chart.options.plotOptions.column.grouping;if(a!==void 0&&!a&&this.group.zIndex!==void 0&&!this.zIndexSet)this.group.attr({zIndex:this.group.zIndex*10}),this.zIndexSet=!0;var b=this.options,e=this.options.states;this.borderWidth=b.borderWidth=o(b.edgeWidth)?b.edgeWidth: +1;d.each(this.data,function(a){if(a.y!==null)a=a.pointAttr,this.borderColor=d.pick(b.edgeColor,a[""].fill),a[""].stroke=this.borderColor,a.hover.stroke=d.pick(e.hover.edgeColor,this.borderColor),a.select.stroke=d.pick(e.select.edgeColor,this.borderColor)})}c.apply(this,[].slice.call(arguments,1))}var q=Math.PI,x=q/180,l=Math.sin,m=Math.cos,y=d.pick,G=Math.round;d.perspective=n;var A=4*(Math.sqrt(2)-1)/3/(q/2);d.SVGRenderer.prototype.toLinePath=function(c,a){var b=[];d.each(c,function(a){b.push("L", +a.x,a.y)});c.length&&(b[0]="M",a&&b.push("Z"));return b};d.SVGRenderer.prototype.cuboid=function(c){var a=this.g(),c=this.cuboidPath(c);a.front=this.path(c[0]).attr({zIndex:c[3],"stroke-linejoin":"round"}).add(a);a.top=this.path(c[1]).attr({zIndex:c[4],"stroke-linejoin":"round"}).add(a);a.side=this.path(c[2]).attr({zIndex:c[5],"stroke-linejoin":"round"}).add(a);a.fillSetter=function(a){var c=d.Color(a).brighten(0.1).get(),f=d.Color(a).brighten(-0.1).get();this.front.attr({fill:a});this.top.attr({fill:c}); +this.side.attr({fill:f});this.color=a;return this};a.opacitySetter=function(a){this.front.attr({opacity:a});this.top.attr({opacity:a});this.side.attr({opacity:a});return this};a.attr=function(a){a.shapeArgs||o(a.x)?(a=this.renderer.cuboidPath(a.shapeArgs||a),this.front.attr({d:a[0],zIndex:a[3]}),this.top.attr({d:a[1],zIndex:a[4]}),this.side.attr({d:a[2],zIndex:a[5]})):d.SVGElement.prototype.attr.call(this,a);return this};a.animate=function(a,c,f){o(a.x)&&o(a.y)?(a=this.renderer.cuboidPath(a),this.front.attr({zIndex:a[3]}).animate({d:a[0]}, +c,f),this.top.attr({zIndex:a[4]}).animate({d:a[1]},c,f),this.side.attr({zIndex:a[5]}).animate({d:a[2]},c,f)):a.opacity?(this.front.animate(a,c,f),this.top.animate(a,c,f),this.side.animate(a,c,f)):d.SVGElement.prototype.animate.call(this,a,c,f);return this};a.destroy=function(){this.front.destroy();this.top.destroy();this.side.destroy();return null};a.attr({zIndex:-c[3]});return a};d.SVGRenderer.prototype.cuboidPath=function(c){var a=c.x,b=c.y,e=c.z,f=c.height,g=c.width,i=c.depth,j=d.map,h=[{x:a,y:b, +z:e},{x:a+g,y:b,z:e},{x:a+g,y:b+f,z:e},{x:a,y:b+f,z:e},{x:a,y:b+f,z:e+i},{x:a+g,y:b+f,z:e+i},{x:a+g,y:b,z:e+i},{x:a,y:b,z:e+i}],h=n(h,d.charts[this.chartIndex],c.insidePlotArea),b=function(a,b){a=j(a,function(a){return h[a]});b=j(b,function(a){return h[a]});return E(a)<0?a:E(b)<0?b:[]},c=b([3,2,1,0],[7,6,5,4]),a=b([1,6,7,0],[4,5,2,3]),b=b([1,2,5,6],[0,7,4,3]);return[this.toLinePath(c,!0),this.toLinePath(a,!0),this.toLinePath(b,!0),C(c),C(a),C(b)]};d.SVGRenderer.prototype.arc3d=function(c){c.alpha*= +x;c.beta*=x;var a=this.g(),b=this.arc3dPath(c),e=a.renderer,f=b.zTop*100;a.shapeArgs=c;a.top=e.path(b.top).setRadialReference(c.center).attr({zIndex:b.zTop}).add(a);a.side1=e.path(b.side2).attr({zIndex:b.zSide1});a.side2=e.path(b.side1).attr({zIndex:b.zSide2});a.inn=e.path(b.inn).attr({zIndex:b.zInn});a.out=e.path(b.out).attr({zIndex:b.zOut});a.fillSetter=function(a){this.color=a;var b=d.Color(a).brighten(-0.1).get();this.side1.attr({fill:b});this.side2.attr({fill:b});this.inn.attr({fill:b});this.out.attr({fill:b}); +this.top.attr({fill:a});return this};a.translateXSetter=function(a){this.out.attr({translateX:a});this.inn.attr({translateX:a});this.side1.attr({translateX:a});this.side2.attr({translateX:a});this.top.attr({translateX:a})};a.translateYSetter=function(a){this.out.attr({translateY:a});this.inn.attr({translateY:a});this.side1.attr({translateY:a});this.side2.attr({translateY:a});this.top.attr({translateY:a})};a.animate=function(a,b,c){o(a.end)||o(a.start)?(this._shapeArgs=this.shapeArgs,d.SVGElement.prototype.animate.call(this, +{_args:a},{duration:b,step:function(){var a=arguments[1],b=a.elem,c=b._shapeArgs,e=a.end,a=a.pos,c=d.merge(c,{x:c.x+(e.x-c.x)*a,y:c.y+(e.y-c.y)*a,r:c.r+(e.r-c.r)*a,innerR:c.innerR+(e.innerR-c.innerR)*a,start:c.start+(e.start-c.start)*a,end:c.end+(e.end-c.end)*a}),e=b.renderer.arc3dPath(c);b.shapeArgs=c;b.top.attr({d:e.top,zIndex:e.zTop});b.inn.attr({d:e.inn,zIndex:e.zInn});b.out.attr({d:e.out,zIndex:e.zOut});b.side1.attr({d:e.side1,zIndex:e.zSide1});b.side2.attr({d:e.side2,zIndex:e.zSide2})}},c)): +d.SVGElement.prototype.animate.call(this,a,b,c);return this};a.destroy=function(){this.top.destroy();this.out.destroy();this.inn.destroy();this.side1.destroy();this.side2.destroy();d.SVGElement.prototype.destroy.call(this)};a.hide=function(){this.top.hide();this.out.hide();this.inn.hide();this.side1.hide();this.side2.hide()};a.show=function(){this.top.show();this.out.show();this.inn.show();this.side1.show();this.side2.show()};a.zIndex=f;a.attr({zIndex:f});return a};d.SVGRenderer.prototype.arc3dPath= +function(c){var a=c.x,b=c.y,e=c.start,d=c.end-1.0E-5,g=c.r,i=c.innerR,j=c.depth,h=c.alpha,k=c.beta,v=m(e),p=l(e),c=m(d),n=l(d),s=g*m(k),t=g*m(h),u=i*m(k);i*=m(h);var w=j*l(k),o=j*l(h),j=["M",a+s*v,b+t*p],j=j.concat(r(a,b,s,t,e,d,0,0)),j=j.concat(["L",a+u*c,b+i*n]),j=j.concat(r(a,b,u,i,d,e,0,0)),j=j.concat(["Z"]),k=k>0?q/2:0,h=h>0?0:q/2,k=e>-k?e:d>-k?-k:e,x=d0?4:-1}).css({stroke:g.color}).add()):(d={x:l+(a.yAxis[0].opposite?0:-f.size),y:p+(a.xAxis[0].opposite?-g.size:0),z:j,width:k+f.size,height:h+g.size,depth:i.size,insidePlotArea:!1},this.backFrame?this.backFrame.animate(d):this.backFrame=b.cuboid(d).attr({fill:i.color,zIndex:-3}).css({stroke:i.color}).add(), +a={x:l+(a.yAxis[0].opposite?k:-f.size),y:p+(a.xAxis[0].opposite?-g.size:0),z:0,width:f.size,height:h+g.size,depth:j,insidePlotArea:!1},this.sideFrame?this.sideFrame.animate(a):this.sideFrame=b.cuboid(a).attr({fill:f.color,zIndex:-2}).css({stroke:f.color}).add())}});d.wrap(d.Axis.prototype,"getPlotLinePath",function(c){var a=c.apply(this,[].slice.call(arguments,1));if(!this.chart.is3d())return a;if(a===null)return a;var b=this.chart.options.chart.options3d,b=this.isZAxis?this.chart.plotWidth:b.depth, +d=this.opposite;this.horiz&&(d=!d);a=[this.swapZ({x:a[1],y:a[2],z:d?b:0}),this.swapZ({x:a[1],y:a[2],z:b}),this.swapZ({x:a[4],y:a[5],z:b}),this.swapZ({x:a[4],y:a[5],z:d?0:b})];a=n(a,this.chart,!1);return a=this.chart.renderer.toLinePath(a,!1)});d.wrap(d.Axis.prototype,"getLinePath",function(){return[]});d.wrap(d.Axis.prototype,"getPlotBandPath",function(c){if(this.chart.is3d()){var a=arguments,b=a[1],a=this.getPlotLinePath(a[2]);(b=this.getPlotLinePath(b))&&a?b.push("L",a[10],a[11],"L",a[7],a[8],"L", +a[4],a[5],"L",a[1],a[2]):b=null;return b}else return c.apply(this,[].slice.call(arguments,1))});d.wrap(d.Tick.prototype,"getMarkPath",function(c){var a=c.apply(this,[].slice.call(arguments,1));if(!this.axis.chart.is3d())return a;a=[this.axis.swapZ({x:a[1],y:a[2],z:0}),this.axis.swapZ({x:a[4],y:a[5],z:0})];a=n(a,this.axis.chart,!1);return a=["M",a[0].x,a[0].y,"L",a[1].x,a[1].y]});d.wrap(d.Tick.prototype,"getLabelPosition",function(c){var a=c.apply(this,[].slice.call(arguments,1));if(!this.axis.chart.is3d())return a; +var b=n([this.axis.swapZ({x:a.x,y:a.y,z:0})],this.axis.chart,!1)[0];b.x-=!this.axis.horiz&&this.axis.opposite?this.axis.transA:0;b.old=a;return b});d.wrap(d.Tick.prototype,"handleOverflow",function(c,a){if(this.axis.chart.is3d())a=a.old;return c.call(this,a)});d.wrap(d.Axis.prototype,"getTitlePosition",function(c){var a=c.apply(this,[].slice.call(arguments,1));return!this.chart.is3d()?a:a=n([this.swapZ({x:a.x,y:a.y,z:0})],this.chart,!1)[0]});d.wrap(d.Axis.prototype,"drawCrosshair",function(c){var a= +arguments;this.chart.is3d()&&a[2]&&(a[2]={plotX:a[2].plotXold||a[2].plotX,plotY:a[2].plotYold||a[2].plotY});c.apply(this,[].slice.call(a,1))});d.Axis.prototype.swapZ=function(c,a){if(this.isZAxis){var b=a?0:this.chart.plotLeft,d=this.chart;return{x:b+(d.yAxis[0].opposite?c.z:d.xAxis[0].width-c.z),y:c.y,z:c.x-b}}else return c};var D=d.ZAxis=function(){this.isZAxis=!0;this.init.apply(this,arguments)};d.extend(D.prototype,d.Axis.prototype);d.extend(D.prototype,{setOptions:function(c){c=d.merge({offset:0, +lineWidth:0},c);d.Axis.prototype.setOptions.call(this,c);this.coll="zAxis"},setAxisSize:function(){d.Axis.prototype.setAxisSize.call(this);this.width=this.len=this.chart.options.chart.options3d.depth;this.right=this.chart.chartWidth-this.width-this.left},getSeriesExtremes:function(){var c=this,a=c.chart;c.hasVisibleSeries=!1;c.dataMin=c.dataMax=c.ignoreMinPadding=c.ignoreMaxPadding=null;c.buildStacks&&c.buildStacks();d.each(c.series,function(b){if(b.visible||!a.options.chart.ignoreHiddenSeries)if(c.hasVisibleSeries= +!0,b=b.zData,b.length)c.dataMin=Math.min(y(c.dataMin,b[0]),Math.min.apply(null,b)),c.dataMax=Math.max(y(c.dataMax,b[0]),Math.max.apply(null,b))})}});d.wrap(d.Chart.prototype,"getAxes",function(c){var a=this,b=this.options,b=b.zAxis=d.splat(b.zAxis||{});c.call(this);if(a.is3d())this.zAxis=[],d.each(b,function(b,c){b.index=c;b.isX=!0;(new D(a,b)).setScale()})});d.wrap(d.seriesTypes.column.prototype,"translate",function(c){c.apply(this,[].slice.call(arguments,1));if(this.chart.is3d()){var a=this.chart, +b=this.options,e=b.depth||25,f=(b.stacking?b.stack||0:this._i)*(e+(b.groupZPadding||1));b.grouping!==!1&&(f=0);f+=b.groupZPadding||1;d.each(this.data,function(b){if(b.y!==null){var c=b.shapeArgs,d=b.tooltipPos;b.shapeType="cuboid";c.z=f;c.depth=e;c.insidePlotArea=!0;d=n([{x:d[0],y:d[1],z:f}],a,!1)[0];b.tooltipPos=[d.x,d.y]}});this.z=f}});d.wrap(d.seriesTypes.column.prototype,"animate",function(c){if(this.chart.is3d()){var a=arguments[1],b=this.yAxis,e=this,f=this.yAxis.reversed;if(d.svg)a?d.each(e.data, +function(a){if(a.y!==null&&(a.height=a.shapeArgs.height,a.shapey=a.shapeArgs.y,a.shapeArgs.height=1,!f))a.shapeArgs.y=a.stackY?a.plotY+b.translate(a.stackY):a.plotY+(a.negative?-a.height:a.height)}):(d.each(e.data,function(a){if(a.y!==null)a.shapeArgs.height=a.height,a.shapeArgs.y=a.shapey,a.graphic&&a.graphic.animate(a.shapeArgs,e.options.animation)}),this.drawDataLabels(),e.animate=null)}else c.apply(this,[].slice.call(arguments,1))});d.wrap(d.seriesTypes.column.prototype,"init",function(c){c.apply(this, +[].slice.call(arguments,1));if(this.chart.is3d()){var a=this.options,b=a.grouping,d=a.stacking,f=0;if(b===void 0||b){b=this.chart.retrieveStacks(d);d=a.stack||0;for(f=0;f0?l(i)*g:0);b[3]+=-d*(1-m(i))*l(c)+(l(c)>0?l(i)*g:0);b[5]+=-d*(1-m(i))*l(c)+(l(c)>0?l(i)*g:0)})}c.apply(this,[].slice.call(arguments,1))});d.wrap(d.seriesTypes.pie.prototype,"addPoint",function(c){c.apply(this,[].slice.call(arguments,1));this.chart.is3d()&&this.update(this.userOptions,!0)});d.wrap(d.seriesTypes.pie.prototype,"animate",function(c){if(this.chart.is3d()){var a= +arguments[1],b=this.options.animation,e=this.center,f=this.group,g=this.markerGroup;if(d.svg)if(b===!0&&(b={}),a){if(f.oldtranslateX=f.translateX,f.oldtranslateY=f.translateY,a={translateX:e[0],translateY:e[1],scaleX:0.001,scaleY:0.001},f.attr(a),g)g.attrSetters=f.attrSetters,g.attr(a)}else a={translateX:f.oldtranslateX,translateY:f.oldtranslateY,scaleX:1,scaleY:1},f.animate(a,b),g&&g.animate(a,b),this.animate=null}else c.apply(this,[].slice.call(arguments,1))});d.wrap(d.seriesTypes.scatter.prototype, +"translate",function(c){c.apply(this,[].slice.call(arguments,1));if(this.chart.is3d()){var a=this.chart,b=d.pick(this.zAxis,a.options.zAxis[0]),e=[],f,g;for(g=0;g=b.min&&f.z<=b.max:!1,e.push({x:f.plotX,y:f.plotY,z:b.translate(f.z)});a=n(e,a,!0);for(g=0;g{point.x}
y: {point.y}
z: {point.z}
":"x: {point.x}
y: {point.y}
z: {point.z}
";return c});if(d.VMLRenderer)d.setOptions({animate:!1}),d.VMLRenderer.prototype.cuboid=d.SVGRenderer.prototype.cuboid,d.VMLRenderer.prototype.cuboidPath= +d.SVGRenderer.prototype.cuboidPath,d.VMLRenderer.prototype.toLinePath=d.SVGRenderer.prototype.toLinePath,d.VMLRenderer.prototype.createElement3D=d.SVGRenderer.prototype.createElement3D,d.VMLRenderer.prototype.arc3d=function(c){c=d.SVGRenderer.prototype.arc3d.call(this,c);c.css({zIndex:c.zIndex});return c},d.VMLRenderer.prototype.arc3dPath=d.SVGRenderer.prototype.arc3dPath,d.wrap(d.Axis.prototype,"render",function(c){c.apply(this,[].slice.call(arguments,1));this.sideFrame&&(this.sideFrame.css({zIndex:0}), +this.sideFrame.front.attr({fill:this.sideFrame.color}));this.bottomFrame&&(this.bottomFrame.css({zIndex:1}),this.bottomFrame.front.attr({fill:this.bottomFrame.color}));this.backFrame&&(this.backFrame.css({zIndex:0}),this.backFrame.front.attr({fill:this.backFrame.color}))})})(Highcharts); diff --git a/src/main/webapp/AccountingManager/js/highcharts-more.js b/src/main/webapp/AccountingManager/js/highcharts-more.js new file mode 100644 index 0000000..c9f769d --- /dev/null +++ b/src/main/webapp/AccountingManager/js/highcharts-more.js @@ -0,0 +1,54 @@ +/* + Highcharts JS v4.1.7 (2015-06-26) + + (c) 2009-2014 Torstein Honsi + + License: www.highcharts.com/license +*/ +(function(k,D){function K(a,b,c){this.init.call(this,a,b,c)}var P=k.arrayMin,Q=k.arrayMax,t=k.each,H=k.extend,o=k.merge,R=k.map,q=k.pick,x=k.pInt,p=k.getOptions().plotOptions,h=k.seriesTypes,v=k.extendClass,L=k.splat,u=k.wrap,M=k.Axis,y=k.Tick,I=k.Point,S=k.Pointer,T=k.CenteredSeriesMixin,z=k.TrackerMixin,s=k.Series,w=Math,E=w.round,B=w.floor,N=w.max,U=k.Color,r=function(){};H(K.prototype,{init:function(a,b,c){var d=this,e=d.defaultOptions;d.chart=b;d.options=a=o(e,b.angular?{background:{}}:void 0, +a);(a=a.background)&&t([].concat(L(a)).reverse(),function(a){var b=a.backgroundColor,g=c.userOptions,a=o(d.defaultBackgroundOptions,a);if(b)a.backgroundColor=b;a.color=a.backgroundColor;c.options.plotBands.unshift(a);g.plotBands=g.plotBands||[];g.plotBands.unshift(a)})},defaultOptions:{center:["50%","50%"],size:"85%",startAngle:0},defaultBackgroundOptions:{shape:"circle",borderWidth:1,borderColor:"silver",backgroundColor:{linearGradient:{x1:0,y1:0,x2:0,y2:1},stops:[[0,"#FFF"],[1,"#DDD"]]},from:-Number.MAX_VALUE, +innerRadius:0,to:Number.MAX_VALUE,outerRadius:"105%"}});var G=M.prototype,y=y.prototype,V={getOffset:r,redraw:function(){this.isDirty=!1},render:function(){this.isDirty=!1},setScale:r,setCategories:r,setTitle:r},O={isRadial:!0,defaultRadialGaugeOptions:{labels:{align:"center",x:0,y:null},minorGridLineWidth:0,minorTickInterval:"auto",minorTickLength:10,minorTickPosition:"inside",minorTickWidth:1,tickLength:10,tickPosition:"inside",tickWidth:2,title:{rotation:0},zIndex:2},defaultRadialXOptions:{gridLineWidth:1, +labels:{align:null,distance:15,x:0,y:null},maxPadding:0,minPadding:0,showLastLabel:!1,tickLength:0},defaultRadialYOptions:{gridLineInterpolation:"circle",labels:{align:"right",x:-3,y:-2},showLastLabel:!1,title:{x:4,text:null,rotation:90}},setOptions:function(a){a=this.options=o(this.defaultOptions,this.defaultRadialOptions,a);if(!a.plotBands)a.plotBands=[]},getOffset:function(){G.getOffset.call(this);this.chart.axisOffset[this.side]=0;this.center=this.pane.center=T.getCenter.call(this.pane)},getLinePath:function(a, +b){var c=this.center,b=q(b,c[2]/2-this.offset);return this.chart.renderer.symbols.arc(this.left+c[0],this.top+c[1],b,b,{start:this.startAngleRad,end:this.endAngleRad,open:!0,innerR:0})},setAxisTranslation:function(){G.setAxisTranslation.call(this);if(this.center)this.transA=this.isCircular?(this.endAngleRad-this.startAngleRad)/(this.max-this.min||1):this.center[2]/2/(this.max-this.min||1),this.minPixelPadding=this.isXAxis?this.transA*this.minPointOffset:0},beforeSetTickPositions:function(){this.autoConnect&& +(this.max+=this.categories&&1||this.pointRange||this.closestPointRange||0)},setAxisSize:function(){G.setAxisSize.call(this);if(this.isRadial){this.center=this.pane.center=k.CenteredSeriesMixin.getCenter.call(this.pane);if(this.isCircular)this.sector=this.endAngleRad-this.startAngleRad;this.len=this.width=this.height=this.center[2]*q(this.sector,1)/2}},getPosition:function(a,b){return this.postTranslate(this.isCircular?this.translate(a):0,q(this.isCircular?b:this.translate(a),this.center[2]/2)-this.offset)}, +postTranslate:function(a,b){var c=this.chart,d=this.center,a=this.startAngleRad+a;return{x:c.plotLeft+d[0]+Math.cos(a)*b,y:c.plotTop+d[1]+Math.sin(a)*b}},getPlotBandPath:function(a,b,c){var d=this.center,e=this.startAngleRad,f=d[2]/2,i=[q(c.outerRadius,"100%"),c.innerRadius,q(c.thickness,10)],g=/%$/,l,m=this.isCircular;this.options.gridLineInterpolation==="polygon"?d=this.getPlotLinePath(a).concat(this.getPlotLinePath(b,!0)):(a=Math.max(a,this.min),b=Math.min(b,this.max),m||(i[0]=this.translate(a), +i[1]=this.translate(b)),i=R(i,function(a){g.test(a)&&(a=x(a,10)*f/100);return a}),c.shape==="circle"||!m?(a=-Math.PI/2,b=Math.PI*1.5,l=!0):(a=e+this.translate(a),b=e+this.translate(b)),d=this.chart.renderer.symbols.arc(this.left+d[0],this.top+d[1],i[0],i[0],{start:Math.min(a,b),end:Math.max(a,b),innerR:q(i[1],i[0]-i[2]),open:l}));return d},getPlotLinePath:function(a,b){var c=this,d=c.center,e=c.chart,f=c.getPosition(a),i,g,l;c.isCircular?l=["M",d[0]+e.plotLeft,d[1]+e.plotTop,"L",f.x,f.y]:c.options.gridLineInterpolation=== +"circle"?(a=c.translate(a))&&(l=c.getLinePath(0,a)):(t(e.xAxis,function(a){a.pane===c.pane&&(i=a)}),l=[],a=c.translate(a),d=i.tickPositions,i.autoConnect&&(d=d.concat([d[0]])),b&&(d=[].concat(d).reverse()),t(d,function(f,c){g=i.getPosition(f,a);l.push(c?"L":"M",g.x,g.y)}));return l},getTitlePosition:function(){var a=this.center,b=this.chart,c=this.options.title;return{x:b.plotLeft+a[0]+(c.x||0),y:b.plotTop+a[1]-{high:0.5,middle:0.25,low:0}[c.align]*a[2]+(c.y||0)}}};u(G,"init",function(a,b,c){var j; +var d=b.angular,e=b.polar,f=c.isX,i=d&&f,g,l;l=b.options;var m=c.pane||0;if(d){if(H(this,i?V:O),g=!f)this.defaultRadialOptions=this.defaultRadialGaugeOptions}else if(e)H(this,O),this.defaultRadialOptions=(g=f)?this.defaultRadialXOptions:o(this.defaultYAxisOptions,this.defaultRadialYOptions);a.call(this,b,c);if(!i&&(d||e)){a=this.options;if(!b.panes)b.panes=[];this.pane=(j=b.panes[m]=b.panes[m]||new K(L(l.pane)[m],b,this),m=j);m=m.options;b.inverted=!1;l.chart.zoomType=null;this.startAngleRad=b=(m.startAngle- +90)*Math.PI/180;this.endAngleRad=l=(q(m.endAngle,m.startAngle+360)-90)*Math.PI/180;this.offset=a.offset||0;if((this.isCircular=g)&&c.max===D&&l-b===2*Math.PI)this.autoConnect=!0}});u(y,"getPosition",function(a,b,c,d,e){var f=this.axis;return f.getPosition?f.getPosition(c):a.call(this,b,c,d,e)});u(y,"getLabelPosition",function(a,b,c,d,e,f,i,g,l){var m=this.axis,j=f.y,n=20,h=f.align,A=(m.translate(this.pos)+m.startAngleRad+Math.PI/2)/Math.PI*180%360;m.isRadial?(a=m.getPosition(this.pos,m.center[2]/ +2+q(f.distance,-25)),f.rotation==="auto"?d.attr({rotation:A}):j===null&&(j=m.chart.renderer.fontMetrics(d.styles.fontSize).b-d.getBBox().height/2),h===null&&(m.isCircular?(this.label.getBBox().width>m.len*m.tickInterval/(m.max-m.min)&&(n=0),h=A>n&&A<180-n?"left":A>180+n&&A<360-n?"right":"center"):h="center",d.attr({align:h})),a.x+=f.x,a.y+=j):a=a.call(this,b,c,d,e,f,i,g,l);return a});u(y,"getMarkPath",function(a,b,c,d,e,f,i){var g=this.axis;g.isRadial?(a=g.getPosition(this.pos,g.center[2]/2+d),b= +["M",b,c,"L",a.x,a.y]):b=a.call(this,b,c,d,e,f,i);return b});p.arearange=o(p.area,{lineWidth:1,marker:null,threshold:null,tooltip:{pointFormat:'\u25CF {series.name}: {point.low} - {point.high}
'},trackByArea:!0,dataLabels:{align:null,verticalAlign:null,xLow:0,xHigh:0,yLow:0,yHigh:0},states:{hover:{halo:!1}}});h.arearange=v(h.area,{type:"arearange",pointArrayMap:["low","high"],toYData:function(a){return[a.low,a.high]},pointValKey:"low",deferTranslatePolar:!0, +highToXY:function(a){var b=this.chart,c=this.xAxis.postTranslate(a.rectPlotX,this.yAxis.len-a.plotHigh);a.plotHighX=c.x-b.plotLeft;a.plotHigh=c.y-b.plotTop},getSegments:function(){var a=this;t(a.points,function(b){if(!a.options.connectNulls&&(b.low===null||b.high===null))b.y=null;else if(b.low===null&&b.high!==null)b.y=b.high});s.prototype.getSegments.call(this)},translate:function(){var a=this,b=a.yAxis;h.area.prototype.translate.apply(a);t(a.points,function(a){var d=a.low,e=a.high,f=a.plotY;e=== +null&&d===null?a.y=null:d===null?(a.plotLow=a.plotY=null,a.plotHigh=b.translate(e,0,1,0,1)):e===null?(a.plotLow=f,a.plotHigh=null):(a.plotLow=f,a.plotHigh=b.translate(e,0,1,0,1))});this.chart.polar&&t(this.points,function(c){a.highToXY(c)})},getSegmentPath:function(a){var b,c=[],d=a.length,e=s.prototype.getSegmentPath,f,i;i=this.options;var g=i.step;for(b=HighchartsAdapter.grep(a,function(a){return a.plotLow!==null});d--;)f=a[d],f.plotHigh!==null&&c.push({plotX:f.plotHighX||f.plotX,plotY:f.plotHigh}); +a=e.call(this,b);if(g)g===!0&&(g="left"),i.step={left:"right",center:"center",right:"left"}[g];c=e.call(this,c);i.step=g;i=[].concat(a,c);this.chart.polar||(c[0]="L");this.areaPath=this.areaPath.concat(a,c);return i},drawDataLabels:function(){var a=this.data,b=a.length,c,d=[],e=s.prototype,f=this.options.dataLabels,i=f.align,g,l,m=this.chart.inverted;if(f.enabled||this._hasPointLabels){for(c=b;c--;)if(g=a[c])if(l=g.plotHigh>g.plotLow,g.y=g.high,g._plotY=g.plotY,g.plotY=g.plotHigh,d[c]=g.dataLabel, +g.dataLabel=g.dataLabelUpper,g.below=l,m){if(!i)f.align=l?"right":"left";f.x=f.xHigh}else f.y=f.yHigh;e.drawDataLabels&&e.drawDataLabels.apply(this,arguments);for(c=b;c--;)if(g=a[c])if(l=g.plotHigh>g.plotLow,g.dataLabelUpper=g.dataLabel,g.dataLabel=d[c],g.y=g.low,g.plotY=g._plotY,g.below=!l,m){if(!i)f.align=l?"left":"right";f.x=f.xLow}else f.y=f.yLow;e.drawDataLabels&&e.drawDataLabels.apply(this,arguments)}f.align=i},alignDataLabel:function(){h.column.prototype.alignDataLabel.apply(this,arguments)}, +setStackedPoints:r,getSymbol:r,drawPoints:r});p.areasplinerange=o(p.arearange);h.areasplinerange=v(h.arearange,{type:"areasplinerange",getPointSpline:h.spline.prototype.getPointSpline});(function(){var a=h.column.prototype;p.columnrange=o(p.column,p.arearange,{lineWidth:1,pointRange:null});h.columnrange=v(h.arearange,{type:"columnrange",translate:function(){var b=this,c=b.yAxis,d;a.translate.apply(b);t(b.points,function(a){var f=a.shapeArgs,i=b.options.minPointLength,g;a.tooltipPos=null;a.plotHigh= +d=c.translate(a.high,0,1,0,1);a.plotLow=a.plotY;g=d;a=a.plotY-d;Math.abs(a)\u25CF {series.name}
Maximum: {point.high}
Upper quartile: {point.q3}
Median: {point.median}
Lower quartile: {point.q1}
Minimum: {point.low}
'},whiskerLength:"50%",whiskerWidth:2});h.boxplot=v(h.column,{type:"boxplot",pointArrayMap:["low","q1", +"median","q3","high"],toYData:function(a){return[a.low,a.q1,a.median,a.q3,a.high]},pointValKey:"high",pointAttrToOptions:{fill:"fillColor",stroke:"color","stroke-width":"lineWidth"},drawDataLabels:r,translate:function(){var a=this.yAxis,b=this.pointArrayMap;h.column.prototype.translate.apply(this);t(this.points,function(c){t(b,function(b){c[b]!==null&&(c[b+"Plot"]=a.translate(c[b],0,1,0,1))})})},drawPoints:function(){var a=this,b=a.points,c=a.options,d=a.chart.renderer,e,f,i,g,l,m,j,n,h,A,k,J,p,o, +u,r,v,s,w,x,z,y,F=a.doQuartiles!==!1,C=parseInt(a.options.whiskerLength,10)/100;t(b,function(b){h=b.graphic;z=b.shapeArgs;k={};o={};r={};y=b.color||a.color;if(b.plotY!==D)if(e=b.pointAttr[b.selected?"selected":""],v=z.width,s=B(z.x),w=s+v,x=E(v/2),f=B(F?b.q1Plot:b.lowPlot),i=B(F?b.q3Plot:b.lowPlot),g=B(b.highPlot),l=B(b.lowPlot),k.stroke=b.stemColor||c.stemColor||y,k["stroke-width"]=q(b.stemWidth,c.stemWidth,c.lineWidth),k.dashstyle=b.stemDashStyle||c.stemDashStyle,o.stroke=b.whiskerColor||c.whiskerColor|| +y,o["stroke-width"]=q(b.whiskerWidth,c.whiskerWidth,c.lineWidth),r.stroke=b.medianColor||c.medianColor||y,r["stroke-width"]=q(b.medianWidth,c.medianWidth,c.lineWidth),j=k["stroke-width"]%2/2,n=s+x+j,A=["M",n,i,"L",n,g,"M",n,f,"L",n,l],F&&(j=e["stroke-width"]%2/2,n=B(n)+j,f=B(f)+j,i=B(i)+j,s+=j,w+=j,J=["M",s,i,"L",s,f,"L",w,f,"L",w,i,"L",s,i,"z"]),C&&(j=o["stroke-width"]%2/2,g+=j,l+=j,p=["M",n-x*C,g,"L",n+x*C,g,"M",n-x*C,l,"L",n+x*C,l]),j=r["stroke-width"]%2/2,m=E(b.medianPlot)+j,u=["M",s,m,"L",w, +m],h)b.stem.animate({d:A}),C&&b.whiskers.animate({d:p}),F&&b.box.animate({d:J}),b.medianShape.animate({d:u});else{b.graphic=h=d.g().add(a.group);b.stem=d.path(A).attr(k).add(h);if(C)b.whiskers=d.path(p).attr(o).add(h);if(F)b.box=d.path(J).attr(e).add(h);b.medianShape=d.path(u).attr(r).add(h)}})},setStackedPoints:r});p.errorbar=o(p.boxplot,{color:"#000000",grouping:!1,linkedTo:":previous",tooltip:{pointFormat:'\u25CF {series.name}: {point.low} - {point.high}
'}, +whiskerWidth:null});h.errorbar=v(h.boxplot,{type:"errorbar",pointArrayMap:["low","high"],toYData:function(a){return[a.low,a.high]},pointValKey:"high",doQuartiles:!1,drawDataLabels:h.arearange?h.arearange.prototype.drawDataLabels:r,getColumnMetrics:function(){return this.linkedParent&&this.linkedParent.columnMetrics||h.column.prototype.getColumnMetrics.call(this)}});p.waterfall=o(p.column,{lineWidth:1,lineColor:"#333",dashStyle:"dot",borderColor:"#333",dataLabels:{inside:!0},states:{hover:{lineWidthPlus:0}}}); +h.waterfall=v(h.column,{type:"waterfall",upColorProp:"fill",pointValKey:"y",translate:function(){var a=this.options,b=this.yAxis,c,d,e,f,i,g,l,m,j,n=a.threshold,k=a.stacking;h.column.prototype.translate.apply(this);l=m=n;d=this.points;for(c=0,a=d.length;c0?b.translate(l,0,1)-f.y:b.translate(l,0,1)-b.translate(l-g,0,1);l+=g}f.height<0&&(f.y+=f.height,f.height*=-1);e.plotY=f.y=E(f.y)-this.borderWidth%2/2;f.height=N(E(f.height),0.001);e.yBottom=f.y+f.height;f=e.plotY+(e.negative?f.height:0);this.chart.inverted?e.tooltipPos[0]=b.len- +f:e.tooltipPos[1]=f}},processData:function(a){var b=this.yData,c=this.options.data,d,e=b.length,f,i,g,l,m,j;i=f=g=l=this.options.threshold||0;for(j=0;j0?(b.pointAttr=e,b.color=d):b.pointAttr=a.pointAttr})},getGraphPath:function(){var a=this.data,b=a.length,c=E(this.options.lineWidth+this.borderWidth)%2/2,d=[],e,f,i;for(i=1;i0?(g[f]-a)/(b-a):0.5,m&&i>=0&&(i=Math.sqrt(i)),l.push(w.ceil(c+i*(d-c))/2);this.radii=l},animate:function(a){var b=this.options.animation;if(!a)t(this.points,function(a){var d=a.graphic,a=a.shapeArgs;d&&a&&(d.attr("r",1),d.animate({r:a.r},b))}),this.animate=null},translate:function(){var a,b=this.data,c,d,e=this.radii;h.scatter.prototype.translate.call(this);for(a=b.length;a--;)c=b[a],d=e?e[a]:0,d>=this.minPxSize/2?(c.shapeType="circle",c.shapeArgs={x:c.plotX,y:c.plotY,r:d},c.dlBox= +{x:c.plotX-d,y:c.plotY-d,width:2*d,height:2*d}):c.shapeArgs=c.plotY=c.dlBox=D},drawLegendSymbol:function(a,b){var c=x(a.itemStyle.fontSize)/2;b.legendSymbol=this.chart.renderer.circle(c,a.baseline-c,c).attr({zIndex:3}).add(b.legendGroup);b.legendSymbol.isMarker=!0},drawPoints:h.column.prototype.drawPoints,alignDataLabel:h.column.prototype.alignDataLabel,buildKDTree:r,applyZones:r});M.prototype.beforePadding=function(){var a=this,b=this.len,c=this.chart,d=0,e=b,f=this.isXAxis,i=f?"xData":"yData",g= +this.min,l={},m=w.min(c.plotWidth,c.plotHeight),j=Number.MAX_VALUE,n=-Number.MAX_VALUE,h=this.max-g,k=b/h,p=[];t(this.series,function(b){var g=b.options;if(b.bubblePadding&&(b.visible||!c.options.chart.ignoreHiddenSeries))if(a.allowZoomOutside=!0,p.push(b),f)t(["minSize","maxSize"],function(a){var b=g[a],f=/%$/.test(b),b=x(b);l[a]=f?m*b/100:b}),b.minPxSize=l.minSize,b=b.zData,b.length&&(j=q(g.zMin,w.min(j,w.max(P(b),g.displayNegative===!1?g.zThreshold:-Number.MAX_VALUE))),n=q(g.zMax,w.max(n,Q(b))))}); +t(p,function(a){var b=a[i],c=b.length,m;f&&a.getRadii(j,n,l.minSize,l.maxSize);if(h>0)for(;c--;)typeof b[c]==="number"&&(m=a.radii[c],d=Math.min((b[c]-g)*k-m,d),e=Math.max((b[c]-g)*k+m,e))});p.length&&h>0&&q(this.options.min,this.userMin)===D&&q(this.options.max,this.userMax)===D&&(e-=b,k*=(b+d-e)/b,this.min+=d/k,this.max+=e/k)};(function(){function a(a,b,c){a.call(this,b,c);if(this.chart.polar)this.closeSegment=function(a){var b=this.xAxis.center;a.push("L",b[0],b[1])},this.closedStacks=!0}function b(a, +b){var c=this.chart,d=this.options.animation,e=this.group,j=this.markerGroup,n=this.xAxis.center,h=c.plotLeft,k=c.plotTop;if(c.polar){if(c.renderer.isSVG)d===!0&&(d={}),b?(c={translateX:n[0]+h,translateY:n[1]+k,scaleX:0.001,scaleY:0.001},e.attr(c),j&&j.attr(c)):(c={translateX:h,translateY:k,scaleX:1,scaleY:1},e.animate(c,d),j&&j.animate(c,d),this.animate=null)}else a.call(this,b)}var c=s.prototype,d=S.prototype,e;c.searchPointByAngle=function(a){var b=this.chart,c=this.xAxis.pane.center;return this.searchKDTree({clientX:180+ +Math.atan2(a.chartX-c[0]-b.plotLeft,a.chartY-c[1]-b.plotTop)*(-180/Math.PI)})};u(c,"buildKDTree",function(a){if(this.chart.polar)this.kdByAngle?this.searchPoint=this.searchPointByAngle:this.kdDimensions=2;a.apply(this)});c.toXY=function(a){var b,c=this.chart,d=a.plotX;b=a.plotY;a.rectPlotX=d;a.rectPlotY=b;b=this.xAxis.postTranslate(a.plotX,this.yAxis.len-b);a.plotX=a.polarPlotX=b.x-c.plotLeft;a.plotY=a.polarPlotY=b.y-c.plotTop;this.kdByAngle?(c=(d/Math.PI*180+this.xAxis.pane.options.startAngle)%360, +c<0&&(c+=360),a.clientX=c):a.clientX=a.plotX};h.area&&u(h.area.prototype,"init",a);h.areaspline&&u(h.areaspline.prototype,"init",a);h.spline&&u(h.spline.prototype,"getPointSpline",function(a,b,c,d){var e,j,n,h,k,p,o;if(this.chart.polar){e=c.plotX;j=c.plotY;a=b[d-1];n=b[d+1];this.connectEnds&&(a||(a=b[b.length-2]),n||(n=b[1]));if(a&&n)h=a.plotX,k=a.plotY,b=n.plotX,p=n.plotY,h=(1.5*e+h)/2.5,k=(1.5*j+k)/2.5,n=(1.5*e+b)/2.5,o=(1.5*j+p)/2.5,b=Math.sqrt(Math.pow(h-e,2)+Math.pow(k-j,2)),p=Math.sqrt(Math.pow(n- +e,2)+Math.pow(o-j,2)),h=Math.atan2(k-j,h-e),k=Math.atan2(o-j,n-e),o=Math.PI/2+(h+k)/2,Math.abs(h-o)>Math.PI/2&&(o-=Math.PI),h=e+Math.cos(o)*b,k=j+Math.sin(o)*b,n=e+Math.cos(Math.PI+o)*p,o=j+Math.sin(Math.PI+o)*p,c.rightContX=n,c.rightContY=o;d?(c=["C",a.rightContX||a.plotX,a.rightContY||a.plotY,h||e,k||j,e,j],a.rightContX=a.rightContY=null):c=["M",e,j]}else c=a.call(this,b,c,d);return c});u(c,"translate",function(a){var b=this.chart;a.call(this);if(b.polar&&(this.kdByAngle=b.tooltip&&b.tooltip.shared, +!this.preventPostTranslate)){a=this.points;for(b=a.length;b--;)this.toXY(a[b])}});u(c,"getSegmentPath",function(a,b){var c=this.points;if(this.chart.polar&&this.options.connectEnds!==!1&&b[b.length-1]===c[c.length-1]&&c[0].y!==null)this.connectEnds=!0,b=[].concat(b,[c[0]]);return a.call(this,b)});u(c,"animate",b);if(h.column)e=h.column.prototype,u(e,"animate",b),u(e,"translate",function(a){var b=this.xAxis,c=this.yAxis.len,d=b.center,e=b.startAngleRad,j=this.chart.renderer,h,k;this.preventPostTranslate= +!0;a.call(this);if(b.isRadial){b=this.points;for(k=b.length;k--;)h=b[k],a=h.barX+e,h.shapeType="path",h.shapeArgs={d:j.symbols.arc(d[0],d[1],c-h.plotY,null,{start:a,end:a+h.pointWidth,innerR:c-q(h.yBottom,c)})},this.toXY(h),h.tooltipPos=[h.plotX,h.plotY],h.ttBelow=h.plotY>d[1]}}),u(e,"alignDataLabel",function(a,b,d,e,h,j){if(this.chart.polar){a=b.rectPlotX/Math.PI*180;if(e.align===null)e.align=a>20&&a<160?"left":a>200&&a<340?"right":"center";if(e.verticalAlign===null)e.verticalAlign=a<45||a>315?"bottom": +a>135&&a<225?"top":"middle";c.alignDataLabel.call(this,b,d,e,h,j)}else a.call(this,b,d,e,h,j)});u(d,"getCoordinates",function(a,b){var c=this.chart,d={xAxis:[],yAxis:[]};c.polar?t(c.axes,function(a){var e=a.isXAxis,f=a.center,h=b.chartX-f[0]-c.plotLeft,f=b.chartY-f[1]-c.plotTop;d[e?"xAxis":"yAxis"].push({axis:a,value:a.translate(e?Math.PI-Math.atan2(h,f):Math.sqrt(Math.pow(h,2)+Math.pow(f,2)),!0)})}):d=a.call(this,b);return d})})()})(Highcharts); diff --git a/src/main/webapp/AccountingManager/js/highcharts.js b/src/main/webapp/AccountingManager/js/highcharts.js new file mode 100644 index 0000000..895d1d0 --- /dev/null +++ b/src/main/webapp/AccountingManager/js/highcharts.js @@ -0,0 +1,325 @@ +/* + Highcharts JS v4.1.7 (2015-06-26) + + (c) 2009-2014 Torstein Honsi + + License: www.highcharts.com/license +*/ +(function(){function z(){var a,b=arguments,c,d={},e=function(a,b){var c,d;typeof a!=="object"&&(a={});for(d in b)b.hasOwnProperty(d)&&(c=b[d],a[d]=c&&typeof c==="object"&&Object.prototype.toString.call(c)!=="[object Array]"&&d!=="renderTo"&&typeof c.nodeType!=="number"?e(a[d]||{},c):b[d]);return a};b[0]===!0&&(d=b[1],b=Array.prototype.slice.call(b,2));c=b.length;for(a=0;a-1?h.thousandsSep:""))):e=Oa(f,e)}j.push(e);a=a.slice(c+1);c=(d=!d)?"}":"{"}j.push(a);return j.join("")}function pb(a){return W.pow(10,V(W.log(a)/W.LN10))}function qb(a,b,c,d,e){var f,g=a,c=p(c,1);f=a/c;b||(b=[1,2,2.5,5,10],d===!1&&(c=== +1?b=[1,2,5,10]:c<=0.1&&(b=[1/c])));for(d=0;d=a||!e&&f<=(b[d]+(b[d+1]||b[d]))/2)break;g*=c;return g}function rb(a,b){var c=a.length,d,e;for(e=0;ec&&(c=a[b]);return c}function Qa(a,b){for(var c in a)a[c]&&a[c]!==b&&a[c].destroy&&a[c].destroy(), +delete a[c]}function Ra(a){fb||(fb=$(Ka));a&&fb.appendChild(a);fb.innerHTML=""}function la(a,b){var c="Highcharts error #"+a+": www.highcharts.com/errors/"+a;if(b)throw c;K.console&&console.log(c)}function ea(a){return parseFloat(a.toPrecision(14))}function Sa(a,b){za=p(a,b.animation)}function Db(){var a=T.global,b=a.useUTC,c=b?"getUTC":"get",d=b?"setUTC":"set";Aa=a.Date||window.Date;ob=b&&a.timezoneOffset;eb=b&&a.getTimezoneOffset;gb=function(a,c,d,h,i,j){var k;b?(k=Aa.UTC.apply(0,arguments),k+= +Wa(k)):k=(new Aa(a,c,p(d,1),p(h,0),p(i,0),p(j,0))).getTime();return k};sb=c+"Minutes";tb=c+"Hours";ub=c+"Day";Xa=c+"Date";Ya=c+"Month";Za=c+"FullYear";Eb=d+"Milliseconds";Fb=d+"Seconds";Gb=d+"Minutes";Hb=d+"Hours";vb=d+"Date";wb=d+"Month";xb=d+"FullYear"}function Q(){}function Ta(a,b,c,d){this.axis=a;this.pos=b;this.type=c||"";this.isNew=!0;!c&&!d&&this.addLabel()}function Ib(a,b,c,d,e){var f=a.chart.inverted;this.axis=a;this.isNegative=c;this.options=b;this.x=d;this.total=null;this.points={};this.stack= +e;this.alignOptions={align:b.align||(f?c?"left":"right":"center"),verticalAlign:b.verticalAlign||(f?"middle":c?"bottom":"top"),y:p(b.y,f?4:c?14:-6),x:p(b.x,f?c?-6:6:0)};this.textAlign=b.textAlign||(f?c?"right":"left":"center")}var y,B=document,K=window,W=Math,r=W.round,V=W.floor,ta=W.ceil,u=W.max,C=W.min,O=W.abs,X=W.cos,aa=W.sin,ma=W.PI,ha=ma*2/360,Ba=navigator.userAgent,Jb=K.opera,ya=/(msie|trident)/i.test(Ba)&&!Jb,hb=B.documentMode===8,ib=/AppleWebKit/.test(Ba),La=/Firefox/.test(Ba),Kb=/(Mobile|Android|Windows Phone)/.test(Ba), +Ca="http://www.w3.org/2000/svg",ca=!!B.createElementNS&&!!B.createElementNS(Ca,"svg").createSVGRect,Ob=La&&parseInt(Ba.split("Firefox/")[1],10)<4,fa=!ca&&!ya&&!!B.createElement("canvas").getContext,$a,ab,Lb={},yb=0,fb,T,Oa,za,zb,E,na=function(){return y},Y=[],bb=0,Ka="div",P="none",Pb=/^[0-9]+$/,jb=["plotTop","marginRight","marginBottom","plotLeft"],Qb="stroke-width",Aa,gb,ob,eb,sb,tb,ub,Xa,Ya,Za,Eb,Fb,Gb,Hb,vb,wb,xb,M={},A;A=K.Highcharts=K.Highcharts?la(16,!0):{};A.seriesTypes=M;var x=A.extend=function(a, +b){var c;a||(a={});for(c in b)a[c]=b[c];return a},p=A.pick=function(){var a=arguments,b,c,d=a.length;for(b=0;b3?c.length%3:0;return e+(g?c.substr(0,g)+d:"")+c.substr(g).replace(/(\d{3})(?=\d)/g,"$1"+d)+(f?b+O(a-c).toFixed(f).slice(2):"")};zb={init:function(a,b,c){var b=b||"",d=a.shift,e=b.indexOf("C")>-1,f=e?7:3,g,b=b.split(" "),c=[].concat(c),h,i,j=function(a){for(g=a.length;g--;)a[g]==="M"&&a.splice(g+ +1,0,a[g+1],a[g+2],a[g+1],a[g+2])};e&&(j(b),j(c));a.isArea&&(h=b.splice(b.length-6,6),i=c.splice(c.length-6,6));if(d<=c.length/f&&b.length===c.length)for(;d--;)c=[].concat(c).splice(0,f).concat(c);a.shift=0;if(b.length)for(a=c.length;b.length{point.key}
',pointFormat:'\u25CF {series.name}: {point.y}
', +shadow:!0,snap:Kb?25:10,style:{color:"#333333",cursor:"default",fontSize:"12px",padding:"8px",whiteSpace:"nowrap"}},credits:{enabled:!0,text:"",href:"",position:{align:"right",x:-10,verticalAlign:"bottom",y:-5},style:{cursor:"pointer",color:"#909090",fontSize:"9px"}}};var ba=T.plotOptions,U=ba.line;Db();var Ub=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]?(?:\.[0-9]+)?)\s*\)/,Vb=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/, +Wb=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/,oa=function(a){var b=[],c,d;(function(a){a&&a.stops?d=Ua(a.stops,function(a){return oa(a[1])}):(c=Ub.exec(a))?b=[D(c[1]),D(c[2]),D(c[3]),parseFloat(c[4],10)]:(c=Vb.exec(a))?b=[D(c[1],16),D(c[2],16),D(c[3],16),1]:(c=Wb.exec(a))&&(b=[D(c[1]),D(c[2]),D(c[3]),1])})(a);return{get:function(c){var f;d?(f=z(a),f.stops=[].concat(f.stops),o(d,function(a,b){f.stops[b]=[f.stops[b][0],a.get(c)]})):f=b&&!isNaN(b[0])?c==="rgb"?"rgb("+b[0]+","+ +b[1]+","+b[2]+")":c==="a"?b[3]:"rgba("+b.join(",")+")":a;return f},brighten:function(a){if(d)o(d,function(b){b.brighten(a)});else if(ra(a)&&a!==0){var c;for(c=0;c<3;c++)b[c]+=D(a*255),b[c]<0&&(b[c]=0),b[c]>255&&(b[c]=255)}return this},rgba:b,setOpacity:function(a){b[3]=a;return this},raw:a}};Q.prototype={opacity:1,textProps:"fontSize,fontWeight,fontFamily,fontStyle,color,lineHeight,width,textDecoration,textShadow".split(","),init:function(a,b){this.element=b==="span"?$(b):B.createElementNS(Ca,b); +this.renderer=a},animate:function(a,b,c){b=p(b,za,!0);db(this);if(b){b=z(b,{});if(c)b.complete=c;mb(this,a,b)}else this.attr(a),c&&c();return this},colorGradient:function(a,b,c){var d=this.renderer,e,f,g,h,i,j,k,l,m,n,v=[];a.linearGradient?f="linearGradient":a.radialGradient&&(f="radialGradient");if(f){g=a[f];h=d.gradients;j=a.stops;m=c.radialReference;Ha(g)&&(a[f]=g={x1:g[0],y1:g[1],x2:g[2],y2:g[3],gradientUnits:"userSpaceOnUse"});f==="radialGradient"&&m&&!q(g.gradientUnits)&&(g=z(g,{cx:m[0]-m[2]/ +2+g.cx*m[2],cy:m[1]-m[2]/2+g.cy*m[2],r:g.r*m[2],gradientUnits:"userSpaceOnUse"}));for(n in g)n!=="id"&&v.push(n,g[n]);for(n in j)v.push(j[n]);v=v.join(",");h[v]?a=h[v].attr("id"):(g.id=a="highcharts-"+yb++,h[v]=i=d.createElement(f).attr(g).add(d.defs),i.stops=[],o(j,function(a){a[1].indexOf("rgba")===0?(e=oa(a[1]),k=e.get("rgb"),l=e.get("a")):(k=a[1],l=1);a=d.createElement("stop").attr({offset:a[0],"stop-color":k,"stop-opacity":l}).add(i);i.stops.push(a)}));c.setAttribute(b,"url("+d.url+"#"+a+")")}}, +applyTextShadow:function(a){var b=this.element,c,d=a.indexOf("contrast")!==-1,e={},f=this.renderer.forExport||b.style.textShadow!==y&&!ya;if(d)e.textShadow=a=a.replace(/contrast/g,this.renderer.getContrast(b.style.fill));if(ib)e.textRendering="geometricPrecision";f?L(b,e):(this.fakeTS=!0,this.ySetter=this.xSetter,c=[].slice.call(b.getElementsByTagName("tspan")),o(a.split(/\s?,\s?/g),function(a){var d=b.firstChild,e,f,a=a.split(" ");e=a[a.length-1];(f=a[a.length-2])&&o(c,function(a,c){var g;c===0&& +(a.setAttribute("x",b.getAttribute("x")),c=b.getAttribute("y"),a.setAttribute("y",c||0),c===null&&b.setAttribute("y",0));g=a.cloneNode(1);J(g,{"class":"highcharts-text-shadow",fill:e,stroke:e,"stroke-opacity":1/u(D(f),3),"stroke-width":f,"stroke-linejoin":"round"});b.insertBefore(g,d)})}))},attr:function(a,b){var c,d,e=this.element,f,g=this,h;typeof a==="string"&&b!==y&&(c=a,a={},a[c]=b);if(typeof a==="string")g=(this[a+"Getter"]||this._defaultGetter).call(this,a,e);else{for(c in a){d=a[c];h=!1;this.symbolName&& +/^(x|y|width|height|r|start|end|innerR|anchorX|anchorY)/.test(c)&&(f||(this.symbolAttr(a),f=!0),h=!0);if(this.rotation&&(c==="x"||c==="y"))this.doTransform=!0;h||(this[c+"Setter"]||this._defaultSetter).call(this,d,c,e);this.shadows&&/^(width|height|visibility|x|y|d|transform|cx|cy|r)$/.test(c)&&this.updateShadows(c,d)}if(this.doTransform)this.updateTransform(),this.doTransform=!1}return g},updateShadows:function(a,b){for(var c=this.shadows,d=c.length;d--;)c[d].setAttribute(a,a==="height"?u(b-(c[d].cutHeight|| +0),0):a==="d"?this.d:b)},addClass:function(a){var b=this.element,c=J(b,"class")||"";c.indexOf(a)===-1&&J(b,"class",c+" "+a);return this},symbolAttr:function(a){var b=this;o("x,y,r,start,end,width,height,innerR,anchorX,anchorY".split(","),function(c){b[c]=p(a[c],b[c])});b.attr({d:b.renderer.symbols[b.symbolName](b.x,b.y,b.width,b.height,b)})},clip:function(a){return this.attr("clip-path",a?"url("+this.renderer.url+"#"+a.id+")":P)},crisp:function(a){var b,c={},d,e=a.strokeWidth||this.strokeWidth||0; +d=r(e)%2/2;a.x=V(a.x||this.x||0)+d;a.y=V(a.y||this.y||0)+d;a.width=V((a.width||this.width||0)-2*d);a.height=V((a.height||this.height||0)-2*d);a.strokeWidth=e;for(b in a)this[b]!==a[b]&&(this[b]=c[b]=a[b]);return c},css:function(a){var b=this.styles,c={},d=this.element,e,f,g="";e=!b;if(a&&a.color)a.fill=a.color;if(b)for(f in a)a[f]!==b[f]&&(c[f]=a[f],e=!0);if(e){e=this.textWidth=a&&a.width&&d.nodeName.toLowerCase()==="text"&&D(a.width)||this.textWidth;b&&(a=x(b,c));this.styles=a;e&&(fa||!ca&&this.renderer.forExport)&& +delete a.width;if(ya&&!ca)L(this.element,a);else{b=function(a,b){return"-"+b.toLowerCase()};for(f in a)g+=f.replace(/([A-Z])/g,b)+":"+a[f]+";";J(d,"style",g)}e&&this.added&&this.renderer.buildText(this)}return this},on:function(a,b){var c=this,d=c.element;ab&&a==="click"?(d.ontouchstart=function(a){c.touchEventFired=Aa.now();a.preventDefault();b.call(d,a)},d.onclick=function(a){(Ba.indexOf("Android")===-1||Aa.now()-(c.touchEventFired||0)>1100)&&b.call(d,a)}):d["on"+a]=b;return this},setRadialReference:function(a){this.element.radialReference= +a;return this},translate:function(a,b){return this.attr({translateX:a,translateY:b})},invert:function(){this.inverted=!0;this.updateTransform();return this},updateTransform:function(){var a=this.translateX||0,b=this.translateY||0,c=this.scaleX,d=this.scaleY,e=this.inverted,f=this.rotation,g=this.element;e&&(a+=this.attr("width"),b+=this.attr("height"));a=["translate("+a+","+b+")"];e?a.push("rotate(90) scale(-1,1)"):f&&a.push("rotate("+f+" "+(g.getAttribute("x")||0)+" "+(g.getAttribute("y")||0)+")"); +(q(c)||q(d))&&a.push("scale("+p(c,1)+" "+p(d,1)+")");a.length&&g.setAttribute("transform",a.join(" "))},toFront:function(){var a=this.element;a.parentNode.appendChild(a);return this},align:function(a,b,c){var d,e,f,g,h={};e=this.renderer;f=e.alignedObjects;if(a){if(this.alignOptions=a,this.alignByTranslate=b,!c||Da(c))this.alignTo=d=c||"renderer",ja(f,this),f.push(this),c=null}else a=this.alignOptions,b=this.alignByTranslate,d=this.alignTo;c=p(c,e[d],e);d=a.align;e=a.verticalAlign;f=(c.x||0)+(a.x|| +0);g=(c.y||0)+(a.y||0);if(d==="right"||d==="center")f+=(c.width-(a.width||0))/{right:1,center:2}[d];h[b?"translateX":"x"]=r(f);if(e==="bottom"||e==="middle")g+=(c.height-(a.height||0))/({bottom:1,middle:2}[e]||1);h[b?"translateY":"y"]=r(g);this[this.placed?"animate":"attr"](h);this.placed=!0;this.alignAttr=h;return this},getBBox:function(a){var b,c=this.renderer,d,e=this.rotation,f=this.element,g=this.styles,h=e*ha;d=this.textStr;var i,j=f.style,k,l;d!==y&&(l=["",e||0,g&&g.fontSize,f.style.width].join(","), +l=d===""||Pb.test(d)?"num:"+d.toString().length+l:d+l);l&&!a&&(b=c.cache[l]);if(!b){if(f.namespaceURI===Ca||c.forExport){try{k=this.fakeTS&&function(a){o(f.querySelectorAll(".highcharts-text-shadow"),function(b){b.style.display=a})},La&&j.textShadow?(i=j.textShadow,j.textShadow=""):k&&k(P),b=f.getBBox?x({},f.getBBox()):{width:f.offsetWidth,height:f.offsetHeight},i?j.textShadow=i:k&&k("")}catch(m){}if(!b||b.width<0)b={width:0,height:0}}else b=this.htmlGetBBox();if(c.isSVG){a=b.width;d=b.height;if(ya&& +g&&g.fontSize==="11px"&&d.toPrecision(3)==="16.9")b.height=d=14;if(e)b.width=O(d*aa(h))+O(a*X(h)),b.height=O(d*X(h))+O(a*aa(h))}c.cache[l]=b}return b},show:function(a){a&&this.element.namespaceURI===Ca?this.element.removeAttribute("visibility"):this.attr({visibility:a?"inherit":"visible"});return this},hide:function(){return this.attr({visibility:"hidden"})},fadeOut:function(a){var b=this;b.animate({opacity:0},{duration:a||150,complete:function(){b.attr({y:-9999})}})},add:function(a){var b=this.renderer, +c=this.element,d;if(a)this.parentGroup=a;this.parentInverted=a&&a.inverted;this.textStr!==void 0&&b.buildText(this);this.added=!0;if(!a||a.handleZ||this.zIndex)d=this.zIndexSetter();d||(a?a.element:b.box).appendChild(c);if(this.onAdd)this.onAdd();return this},safeRemoveChild:function(a){var b=a.parentNode;b&&b.removeChild(a)},destroy:function(){var a=this,b=a.element||{},c=a.shadows,d=a.renderer.isSVG&&b.nodeName==="SPAN"&&a.parentGroup,e,f;b.onclick=b.onmouseout=b.onmouseover=b.onmousemove=b.point= +null;db(a);if(a.clipPath)a.clipPath=a.clipPath.destroy();if(a.stops){for(f=0;f]*>/g,"")))},textSetter:function(a){if(a!==this.textStr)delete this.bBox,this.textStr=a,this.added&&this.renderer.buildText(this)},fillSetter:function(a,b,c){typeof a==="string"?c.setAttribute(b,a):a&&this.colorGradient(a,b,c)},zIndexSetter:function(a,b){var c=this.renderer,d=this.parentGroup,c=(d||c).element||c.box,e,f,g=this.element,h;e=this.added;var i;q(a)&&(g.setAttribute(b,a),a=+a,this[b]===a&&(e=!1),this[b]=a);if(e){if((a=this.zIndex)&&d)d.handleZ=!0;d=c.childNodes;for(i=0;i< +d.length&&!h;i++)if(e=d[i],f=J(e,"zIndex"),e!==g&&(D(f)>a||!q(a)&&q(f)))c.insertBefore(g,e),h=!0;h||c.appendChild(g)}return h},_defaultSetter:function(a,b,c){c.setAttribute(b,a)}};Q.prototype.yGetter=Q.prototype.xGetter;Q.prototype.translateXSetter=Q.prototype.translateYSetter=Q.prototype.rotationSetter=Q.prototype.verticalAlignSetter=Q.prototype.scaleXSetter=Q.prototype.scaleYSetter=function(a,b){this[b]=a;this.doTransform=!0};Q.prototype["stroke-widthSetter"]=Q.prototype.strokeSetter=function(a, +b,c){this[b]=a;if(this.stroke&&this["stroke-width"])this.strokeWidth=this["stroke-width"],Q.prototype.fillSetter.call(this,this.stroke,"stroke",c),c.setAttribute("stroke-width",this["stroke-width"]),this.hasStroke=!0;else if(b==="stroke-width"&&a===0&&this.hasStroke)c.removeAttribute("stroke"),this.hasStroke=!1};var ua=function(){this.init.apply(this,arguments)};ua.prototype={Element:Q,init:function(a,b,c,d,e){var f=location,g,d=this.createElement("svg").attr({version:"1.1"}).css(this.getStyle(d)); +g=d.element;a.appendChild(g);a.innerHTML.indexOf("xmlns")===-1&&J(g,"xmlns",Ca);this.isSVG=!0;this.box=g;this.boxWrapper=d;this.alignedObjects=[];this.url=(La||ib)&&B.getElementsByTagName("base").length?f.href.replace(/#.*?$/,"").replace(/([\('\)])/g,"\\$1").replace(/ /g,"%20"):"";this.createElement("desc").add().element.appendChild(B.createTextNode("Created with Highcharts 4.1.7"));this.defs=this.createElement("defs").add();this.forExport=e;this.gradients={};this.cache={};this.setSize(b,c,!1);var h; +if(La&&a.getBoundingClientRect)this.subPixelFix=b=function(){L(a,{left:0,top:0});h=a.getBoundingClientRect();L(a,{left:ta(h.left)-h.left+"px",top:ta(h.top)-h.top+"px"})},b(),H(K,"resize",b)},getStyle:function(a){return this.style=x({fontFamily:'"Lucida Grande", "Lucida Sans Unicode", Arial, Helvetica, sans-serif',fontSize:"12px"},a)},isHidden:function(){return!this.boxWrapper.getBBox().width},destroy:function(){var a=this.defs;this.box=null;this.boxWrapper=this.boxWrapper.destroy();Qa(this.gradients|| +{});this.gradients=null;if(a)this.defs=a.destroy();this.subPixelFix&&Z(K,"resize",this.subPixelFix);return this.alignedObjects=null},createElement:function(a){var b=new this.Element;b.init(this,a);return b},draw:function(){},buildText:function(a){for(var b=a.element,c=this,d=c.forExport,e=p(a.textStr,"").toString(),f=e.indexOf("<")!==-1,g=b.childNodes,h,i,j=J(b,"x"),k=a.styles,l=a.textWidth,m=k&&k.lineHeight,n=k&&k.textShadow,v=k&&k.textOverflow==="ellipsis",s=g.length,S=l&&!a.added&&this.box,N=function(a){return m? +D(m):c.fontMetrics(/(px|em)$/.test(a&&a.style.fontSize)?a.style.fontSize:k&&k.fontSize||c.style.fontSize||12,a).h},t=function(a){return a.replace(/</g,"<").replace(/>/g,">")};s--;)b.removeChild(g[s]);!f&&!n&&!v&&e.indexOf(" ")===-1?b.appendChild(B.createTextNode(t(e))):(h=/<.*style="([^"]+)".*>/,i=/<.*href="(http[^"]+)".*>/,S&&S.appendChild(b),e=f?e.replace(/<(b|strong)>/g,'').replace(/<(i|em)>/g,'').replace(//g, +"").split(//g):[e],e[e.length-1]===""&&e.pop(),o(e,function(e,f){var g,m=0,e=e.replace(//g,"|||");g=e.split("|||");o(g,function(e){if(e!==""||g.length===1){var n={},s=B.createElementNS(Ca,"tspan"),p;h.test(e)&&(p=e.match(h)[1].replace(/(;| |^)color([ :])/,"$1fill$2"),J(s,"style",p));i.test(e)&&!d&&(J(s,"onclick",'location.href="'+e.match(i)[1]+'"'),L(s,{cursor:"pointer"}));e=t(e.replace(/<(.|\n)*?>/g,"")||" ");if(e!==" "){s.appendChild(B.createTextNode(e)); +if(m)n.dx=0;else if(f&&j!==null)n.x=j;J(s,n);b.appendChild(s);!m&&f&&(!ca&&d&&L(s,{display:"block"}),J(s,"dy",N(s)));if(l){for(var n=e.replace(/([^\^])-/g,"$1- ").split(" "),o=g.length>1||f||n.length>1&&k.whiteSpace!=="nowrap",S,w,q,u=[],y=N(s),r=1,x=a.rotation,z=e,C=z.length;(o||v)&&(n.length||u.length);)a.rotation=0,S=a.getBBox(!0),q=S.width,!ca&&c.forExport&&(q=c.measureSpanWidth(s.firstChild.data,a.styles)),S=q>l,w===void 0&&(w=S),v&&w?(C/=2,z===""||!S&&C<0.5?n=[]:(S&&(w=!0),z=e.substring(0,z.length+ +(S?-1:1)*ta(C)),n=[z+(l>3?"…":"")],s.removeChild(s.firstChild))):!S||n.length===1?(n=u,u=[],n.length&&(r++,s=B.createElementNS(Ca,"tspan"),J(s,{dy:y,x:j}),p&&J(s,"style",p),b.appendChild(s)),q>l&&(l=q)):(s.removeChild(s.firstChild),u.unshift(n.pop())),n.length&&s.appendChild(B.createTextNode(n.join(" ").replace(/- /g,"-")));w&&a.attr("title",a.textStr);a.rotation=x}m++}}})}),S&&S.removeChild(b),n&&a.applyTextShadow&&a.applyTextShadow(n))},getContrast:function(a){a=oa(a).rgba;return a[0]+a[1]+a[2]> +384?"#000000":"#FFFFFF"},button:function(a,b,c,d,e,f,g,h,i){var j=this.label(a,b,c,i,null,null,null,null,"button"),k=0,l,m,n,v,s,p,a={x1:0,y1:0,x2:0,y2:1},e=z({"stroke-width":1,stroke:"#CCCCCC",fill:{linearGradient:a,stops:[[0,"#FEFEFE"],[1,"#F6F6F6"]]},r:2,padding:5,style:{color:"black"}},e);n=e.style;delete e.style;f=z(e,{stroke:"#68A",fill:{linearGradient:a,stops:[[0,"#FFF"],[1,"#ACF"]]}},f);v=f.style;delete f.style;g=z(e,{stroke:"#68A",fill:{linearGradient:a,stops:[[0,"#9BD"],[1,"#CDF"]]}},g); +s=g.style;delete g.style;h=z(e,{style:{color:"#CCC"}},h);p=h.style;delete h.style;H(j.element,ya?"mouseover":"mouseenter",function(){k!==3&&j.attr(f).css(v)});H(j.element,ya?"mouseout":"mouseleave",function(){k!==3&&(l=[e,f,g][k],m=[n,v,s][k],j.attr(l).css(m))});j.setState=function(a){(j.state=k=a)?a===2?j.attr(g).css(s):a===3&&j.attr(h).css(p):j.attr(e).css(n)};return j.on("click",function(){k!==3&&d.call(j)}).attr(e).css(x({cursor:"default"},n))},crispLine:function(a,b){a[1]===a[4]&&(a[1]=a[4]= +r(a[1])-b%2/2);a[2]===a[5]&&(a[2]=a[5]=r(a[2])+b%2/2);return a},path:function(a){var b={fill:P};Ha(a)?b.d=a:da(a)&&x(b,a);return this.createElement("path").attr(b)},circle:function(a,b,c){a=da(a)?a:{x:a,y:b,r:c};b=this.createElement("circle");b.xSetter=function(a){this.element.setAttribute("cx",a)};b.ySetter=function(a){this.element.setAttribute("cy",a)};return b.attr(a)},arc:function(a,b,c,d,e,f){if(da(a))b=a.y,c=a.r,d=a.innerR,e=a.start,f=a.end,a=a.x;a=this.symbol("arc",a||0,b||0,c||0,c||0,{innerR:d|| +0,start:e||0,end:f||0});a.r=c;return a},rect:function(a,b,c,d,e,f){var e=da(a)?a.r:e,g=this.createElement("rect"),a=da(a)?a:a===y?{}:{x:a,y:b,width:u(c,0),height:u(d,0)};if(f!==y)a.strokeWidth=f,a=g.crisp(a);if(e)a.r=e;g.rSetter=function(a){J(this.element,{rx:a,ry:a})};return g.attr(a)},setSize:function(a,b,c){var d=this.alignedObjects,e=d.length;this.width=a;this.height=b;for(this.boxWrapper[p(c,!0)?"animate":"attr"]({width:a,height:b});e--;)d[e].align()},g:function(a){var b=this.createElement("g"); +return q(a)?b.attr({"class":"highcharts-"+a}):b},image:function(a,b,c,d,e){var f={preserveAspectRatio:P};arguments.length>1&&x(f,{x:b,y:c,width:d,height:e});f=this.createElement("image").attr(f);f.element.setAttributeNS?f.element.setAttributeNS("http://www.w3.org/1999/xlink","href",a):f.element.setAttribute("hc-svg-href",a);return f},symbol:function(a,b,c,d,e,f){var g,h=this.symbols[a],h=h&&h(r(b),r(c),d,e,f),i=/^url\((.*?)\)$/,j,k;if(h)g=this.path(h),x(g,{symbolName:a,x:b,y:c,width:d,height:e}), +f&&x(g,f);else if(i.test(a))k=function(a,b){a.element&&(a.attr({width:b[0],height:b[1]}),a.alignByTranslate||a.translate(r((d-b[0])/2),r((e-b[1])/2)))},j=a.match(i)[1],a=Lb[j]||f&&f.width&&f.height&&[f.width,f.height],g=this.image(j).attr({x:b,y:c}),g.isImg=!0,a?k(g,a):(g.attr({width:0,height:0}),$("img",{onload:function(){k(g,Lb[j]=[this.width,this.height])},src:j}));return g},symbols:{circle:function(a,b,c,d){var e=0.166*c;return["M",a+c/2,b,"C",a+c+e,b,a+c+e,b+d,a+c/2,b+d,"C",a-e,b+d,a-e,b,a+c/ +2,b,"Z"]},square:function(a,b,c,d){return["M",a,b,"L",a+c,b,a+c,b+d,a,b+d,"Z"]},triangle:function(a,b,c,d){return["M",a+c/2,b,"L",a+c,b+d,a,b+d,"Z"]},"triangle-down":function(a,b,c,d){return["M",a,b,"L",a+c,b,a+c/2,b+d,"Z"]},diamond:function(a,b,c,d){return["M",a+c/2,b,"L",a+c,b+d/2,a+c/2,b+d,a,b+d/2,"Z"]},arc:function(a,b,c,d,e){var f=e.start,c=e.r||c||d,g=e.end-0.001,d=e.innerR,h=e.open,i=X(f),j=aa(f),k=X(g),g=aa(g),e=e.end-fc&&e>b+g&&eb+g&&ed&&h>a+g&&ha+g&&hm&&/[ \-]/.test(b.textContent||b.innerText))L(b,{width:m+"px",display:"block",whiteSpace:j&&j.whiteSpace||"normal"}),i=m;this.getSpanCorrection(i,l,h,k,g)}L(b,{left:e+(this.xCorr||0)+"px",top:f+(this.yCorr||0)+"px"});if(ib)l=b.offsetHeight;this.cTT=n}}else this.alignOnAdd=!0},setSpanRotation:function(a,b,c){var d={},e=ya?"-ms-transform":ib?"-webkit-transform":La?"MozTransform":Jb?"-o-transform":"";d[e]=d.transform="rotate("+a+"deg)"; +d[e+(La?"Origin":"-origin")]=d.transformOrigin=b*100+"% "+c+"px";L(this.element,d)},getSpanCorrection:function(a,b,c){this.xCorr=-a*c;this.yCorr=-b}});x(ua.prototype,{html:function(a,b,c){var d=this.createElement("span"),e=d.element,f=d.renderer;d.textSetter=function(a){a!==e.innerHTML&&delete this.bBox;e.innerHTML=this.textStr=a};d.xSetter=d.ySetter=d.alignSetter=d.rotationSetter=function(a,b){b==="align"&&(b="textAlign");d[b]=a;d.htmlUpdateTransform()};d.attr({text:a,x:r(b),y:r(c)}).css({position:"absolute", +fontFamily:this.style.fontFamily,fontSize:this.style.fontSize});e.style.whiteSpace="nowrap";d.css=d.htmlCss;if(f.isSVG)d.add=function(a){var b,c=f.box.parentNode,j=[];if(this.parentGroup=a){if(b=a.div,!b){for(;a;)j.push(a),a=a.parentGroup;o(j.reverse(),function(a){var d,e=J(a.element,"class");e&&(e={className:e});b=a.div=a.div||$(Ka,e,{position:"absolute",left:(a.translateX||0)+"px",top:(a.translateY||0)+"px"},b||c);d=b.style;x(a,{translateXSetter:function(b,c){d.left=b+"px";a[c]=b;a.doTransform= +!0},translateYSetter:function(b,c){d.top=b+"px";a[c]=b;a.doTransform=!0},visibilitySetter:function(a,b){d[b]=a}})})}}else b=c;b.appendChild(e);d.added=!0;d.alignOnAdd&&d.htmlUpdateTransform();return d};return d}});if(!ca&&!fa){F={init:function(a,b){var c=["<",b,' filled="f" stroked="f"'],d=["position: ","absolute",";"],e=b===Ka;(b==="shape"||e)&&d.push("left:0;top:0;width:1px;height:1px;");d.push("visibility: ",e?"hidden":"visible");c.push(' style="',d.join(""),'"/>');if(b)c=e||b==="span"||b==="img"? +c.join(""):a.prepVML(c),this.element=$(c);this.renderer=a},add:function(a){var b=this.renderer,c=this.element,d=b.box,d=a?a.element||a:d;a&&a.inverted&&b.invertChild(c,d);d.appendChild(c);this.added=!0;this.alignOnAdd&&!this.deferUpdateTransform&&this.updateTransform();if(this.onAdd)this.onAdd();return this},updateTransform:Q.prototype.htmlUpdateTransform,setSpanRotation:function(){var a=this.rotation,b=X(a*ha),c=aa(a*ha);L(this.element,{filter:a?["progid:DXImageTransform.Microsoft.Matrix(M11=",b, +", M12=",-c,", M21=",c,", M22=",b,", sizingMethod='auto expand')"].join(""):P})},getSpanCorrection:function(a,b,c,d,e){var f=d?X(d*ha):1,g=d?aa(d*ha):0,h=p(this.elemHeight,this.element.offsetHeight),i;this.xCorr=f<0&&-a;this.yCorr=g<0&&-h;i=f*g<0;this.xCorr+=g*b*(i?1-c:c);this.yCorr-=f*b*(d?i?c:1-c:1);e&&e!=="left"&&(this.xCorr-=a*c*(f<0?-1:1),d&&(this.yCorr-=h*c*(g<0?-1:1)),L(this.element,{textAlign:e}))},pathToVML:function(a){for(var b=a.length,c=[];b--;)if(ra(a[b]))c[b]=r(a[b]*10)-5;else if(a[b]=== +"Z")c[b]="x";else if(c[b]=a[b],a.isArc&&(a[b]==="wa"||a[b]==="at"))c[b+5]===c[b+7]&&(c[b+7]+=a[b+7]>a[b+5]?1:-1),c[b+6]===c[b+8]&&(c[b+8]+=a[b+8]>a[b+6]?1:-1);return c.join(" ")||"x"},clip:function(a){var b=this,c;a?(c=a.members,ja(c,b),c.push(b),b.destroyClip=function(){ja(c,b)},a=a.getCSS(b)):(b.destroyClip&&b.destroyClip(),a={clip:hb?"inherit":"rect(auto)"});return b.css(a)},css:Q.prototype.htmlCss,safeRemoveChild:function(a){a.parentNode&&Ra(a)},destroy:function(){this.destroyClip&&this.destroyClip(); +return Q.prototype.destroy.apply(this)},on:function(a,b){this.element["on"+a]=function(){var a=K.event;a.target=a.srcElement;b(a)};return this},cutOffPath:function(a,b){var c,a=a.split(/[ ,]/);c=a.length;if(c===9||c===11)a[c-4]=a[c-2]=D(a[c-2])-10*b;return a.join(" ")},shadow:function(a,b,c){var d=[],e,f=this.element,g=this.renderer,h,i=f.style,j,k=f.path,l,m,n,v;k&&typeof k.value!=="string"&&(k="x");m=k;if(a){n=p(a.width,3);v=(a.opacity||0.15)/n;for(e=1;e<=3;e++){l=n*2+1-2*e;c&&(m=this.cutOffPath(k.value, +l+0.5));j=[''];h=$(g.prepVML(j),null,{left:D(i.left)+p(a.offsetX,1),top:D(i.top)+p(a.offsetY,1)});if(c)h.cutOff=l+1;j=[''];$(g.prepVML(j),null,null,h);b?b.element.appendChild(h):f.parentNode.insertBefore(h,f);d.push(h)}this.shadows=d}return this},updateShadows:na,setAttr:function(a,b){hb?this.element[a]=b:this.element.setAttribute(a, +b)},classSetter:function(a){this.element.className=a},dashstyleSetter:function(a,b,c){(c.getElementsByTagName("stroke")[0]||$(this.renderer.prepVML([""]),null,null,c))[b]=a||"solid";this[b]=a},dSetter:function(a,b,c){var d=this.shadows,a=a||[];this.d=a.join&&a.join(" ");c.path=a=this.pathToVML(a);if(d)for(c=d.length;c--;)d[c].path=d[c].cutOff?this.cutOffPath(a,d[c].cutOff):a;this.setAttr(b,a)},fillSetter:function(a,b,c){var d=c.nodeName;if(d==="SPAN")c.style.color=a;else if(d!=="IMG")c.filled= +a!==P,this.setAttr("fillcolor",this.renderer.color(a,c,b,this))},opacitySetter:na,rotationSetter:function(a,b,c){c=c.style;this[b]=c[b]=a;c.left=-r(aa(a*ha)+1)+"px";c.top=r(X(a*ha))+"px"},strokeSetter:function(a,b,c){this.setAttr("strokecolor",this.renderer.color(a,c,b))},"stroke-widthSetter":function(a,b,c){c.stroked=!!a;this[b]=a;ra(a)&&(a+="px");this.setAttr("strokeweight",a)},titleSetter:function(a,b){this.setAttr(b,a)},visibilitySetter:function(a,b,c){a==="inherit"&&(a="visible");this.shadows&& +o(this.shadows,function(c){c.style[b]=a});c.nodeName==="DIV"&&(a=a==="hidden"?"-999em":0,hb||(c.style[b]=a?"visible":"hidden"),b="top");c.style[b]=a},xSetter:function(a,b,c){this[b]=a;b==="x"?b="left":b==="y"&&(b="top");this.updateClipping?(this[b]=a,this.updateClipping()):c.style[b]=a},zIndexSetter:function(a,b,c){c.style[b]=a}};A.VMLElement=F=ka(Q,F);F.prototype.ySetter=F.prototype.widthSetter=F.prototype.heightSetter=F.prototype.xSetter;var Na={Element:F,isIE8:Ba.indexOf("MSIE 8.0")>-1,init:function(a, +b,c,d){var e;this.alignedObjects=[];d=this.createElement(Ka).css(x(this.getStyle(d),{position:"relative"}));e=d.element;a.appendChild(d.element);this.isVML=!0;this.box=e;this.boxWrapper=d;this.cache={};this.setSize(b,c,!1);if(!B.namespaces.hcv){B.namespaces.add("hcv","urn:schemas-microsoft-com:vml");try{B.createStyleSheet().cssText="hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke{ behavior:url(#default#VML); display: inline-block; } "}catch(f){B.styleSheets[0].cssText+="hcv\\:fill, hcv\\:path, hcv\\:shape, hcv\\:stroke{ behavior:url(#default#VML); display: inline-block; } "}}}, +isHidden:function(){return!this.box.offsetWidth},clipRect:function(a,b,c,d){var e=this.createElement(),f=da(a);return x(e,{members:[],count:0,left:(f?a.x:a)+1,top:(f?a.y:b)+1,width:(f?a.width:c)-1,height:(f?a.height:d)-1,getCSS:function(a){var b=a.element,c=b.nodeName,a=a.inverted,d=this.top-(c==="shape"?b.offsetTop:0),e=this.left,b=e+this.width,f=d+this.height,d={clip:"rect("+r(a?e:d)+"px,"+r(a?f:b)+"px,"+r(a?b:f)+"px,"+r(a?d:e)+"px)"};!a&&hb&&c==="DIV"&&x(d,{width:b+"px",height:f+"px"});return d}, +updateClipping:function(){o(e.members,function(a){a.element&&a.css(e.getCSS(a))})}})},color:function(a,b,c,d){var e=this,f,g=/^rgba/,h,i,j=P;a&&a.linearGradient?i="gradient":a&&a.radialGradient&&(i="pattern");if(i){var k,l,m=a.linearGradient||a.radialGradient,n,v,s,p,N,t="",a=a.stops,w,ga=[],q=function(){h=[''];$(e.prepVML(h),null,null,b)};n=a[0];w=a[a.length-1];n[0]>0&&a.unshift([0,n[1]]); +w[0]<1&&a.push([1,w[1]]);o(a,function(a,b){g.test(a[1])?(f=oa(a[1]),k=f.get("rgb"),l=f.get("a")):(k=a[1],l=1);ga.push(a[0]*100+"% "+k);b?(s=l,p=k):(v=l,N=k)});if(c==="fill")if(i==="gradient")c=m.x1||m[0]||0,a=m.y1||m[1]||0,n=m.x2||m[2]||0,m=m.y2||m[3]||0,t='angle="'+(90-W.atan((m-a)/(n-c))*180/ma)+'"',q();else{var j=m.r,u=j*2,y=j*2,r=m.cx,x=m.cy,C=b.radialReference,z,j=function(){C&&(z=d.getBBox(),r+=(C[0]-z.x)/z.width-0.5,x+=(C[1]-z.y)/z.height-0.5,u*=C[2]/z.width,y*=C[2]/z.height);t='src="'+T.global.VMLRadialGradientURL+ +'" size="'+u+","+y+'" origin="0.5,0.5" position="'+r+","+x+'" color2="'+N+'" ';q()};d.added?j():d.onAdd=j;j=p}else j=k}else if(g.test(a)&&b.tagName!=="IMG")f=oa(a),h=["<",c,' opacity="',f.get("a"),'"/>'],$(this.prepVML(h),null,null,b),j=f.get("rgb");else{j=b.getElementsByTagName(c);if(j.length)j[0].opacity=1,j[0].type="solid";j=a}return j},prepVML:function(a){var b=this.isIE8,a=a.join("");b?(a=a.replace("/>",' xmlns="urn:schemas-microsoft-com:vml" />'),a=a.indexOf('style="')===-1?a.replace("/>",' style="display:inline-block;behavior:url(#default#VML);" />'): +a.replace('style="','style="display:inline-block;behavior:url(#default#VML);')):a=a.replace("<","1&&f.attr({x:b,y:c,width:d,height:e});return f},createElement:function(a){return a==="rect"?this.symbol(a):ua.prototype.createElement.call(this,a)},invertChild:function(a,b){var c=this,d=b.style,e=a.tagName==="IMG"&&a.style;L(a,{flip:"x",left:D(d.width)-(e?D(e.top):1),top:D(d.height)-(e?D(e.left):1),rotation:-90});o(a.childNodes,function(b){c.invertChild(b,a)})},symbols:{arc:function(a,b,c,d,e){var f=e.start,g=e.end,h=e.r||c|| +d,c=e.innerR,d=X(f),i=aa(f),j=X(g),k=aa(g);if(g-f===0)return["x"];f=["wa",a-h,b-h,a+h,b+h,a+h*d,b+h*i,a+h*j,b+h*k];e.open&&!c&&f.push("e","M",a,b);f.push("at",a-c,b-c,a+c,b+c,a+c*j,b+c*k,a+c*d,b+c*i,"x","e");f.isArc=!0;return f},circle:function(a,b,c,d,e){e&&(c=d=2*e.r);e&&e.isCircle&&(a-=c/2,b-=d/2);return["wa",a,b,a+c,b+d,a+c,b+d/2,a+c,b+d/2,"e"]},rect:function(a,b,c,d,e){return ua.prototype.symbols[!q(e)||!e.r?"square":"callout"].call(0,a,b,c,d,e)}}};A.VMLRenderer=F=function(){this.init.apply(this, +arguments)};F.prototype=z(ua.prototype,Na);$a=F}ua.prototype.measureSpanWidth=function(a,b){var c=B.createElement("span"),d;d=B.createTextNode(a);c.appendChild(d);L(c,b);this.box.appendChild(c);d=c.offsetWidth;Ra(c);return d};var Mb;if(fa)A.CanVGRenderer=F=function(){Ca="http://www.w3.org/1999/xhtml"},F.prototype.symbols={},Mb=function(){function a(){var a=b.length,d;for(d=0;d0&&c+i*j>e&&(m=r((d-c)/X(h*ha)));else if(d=c+ +(1-i)*j,c-i*je&&(k=e-a.x+k*i,l=-1),k=C(b.slotWidth,k),kk||b.autoRotation&&g.styles.width)m=k;if(m){n.width=m;if(!b.options.labels.style.textOverflow)n.textOverflow="ellipsis";g.css(n)}},getPosition:function(a,b,c,d){var e=this.axis,f=e.chart,g=d&&f.oldChartHeight||f.chartHeight;return{x:a?e.translate(b+c,null,null,d)+e.transB:e.left+e.offset+(e.opposite?(d&&f.oldChartWidth||f.chartWidth)- +e.right-e.left:0),y:a?g-e.bottom+e.offset-(e.opposite?e.height:0):g-e.translate(b+c,null,null,d)-e.transB}},getLabelPosition:function(a,b,c,d,e,f,g,h){var i=this.axis,j=i.transA,k=i.reversed,l=i.staggerLines,m=i.tickRotCorr||{x:0,y:0},c=p(e.y,m.y+(i.side===2?8:-(c.getBBox().height/2))),a=a+e.x+m.x-(f&&d?f*j*(k?-1:1):0),b=b+c-(f&&!d?f*j*(k?1:-1):0);l&&(b+=g/(h||1)%l*(i.labelOffset/l));return{x:a,y:r(b)}},getMarkPath:function(a,b,c,d,e,f){return f.crispLine(["M",a,b,"L",a+(e?0:-c),b+(e?c:0)],d)},render:function(a, +b,c){var d=this.axis,e=d.options,f=d.chart.renderer,g=d.horiz,h=this.type,i=this.label,j=this.pos,k=e.labels,l=this.gridLine,m=h?h+"Grid":"grid",n=h?h+"Tick":"tick",v=e[m+"LineWidth"],s=e[m+"LineColor"],o=e[m+"LineDashStyle"],N=e[n+"Length"],m=e[n+"Width"]||0,t=e[n+"Color"],w=e[n+"Position"],n=this.mark,ga=k.step,q=!0,u=d.tickmarkOffset,r=this.getPosition(g,j,u,b),x=r.x,r=r.y,z=g&&x===d.pos+d.len||!g&&r===d.pos?-1:1,c=p(c,1);this.isActive=!0;if(v){j=d.getPlotLinePath(j+u,v*z,b,!0);if(l===y){l={stroke:s, +"stroke-width":v};if(o)l.dashstyle=o;if(!h)l.zIndex=1;if(b)l.opacity=0;this.gridLine=l=v?f.path(j).attr(l).add(d.gridGroup):null}if(!b&&l&&j)l[this.isNew?"attr":"animate"]({d:j,opacity:c})}if(m&&N)w==="inside"&&(N=-N),d.opposite&&(N=-N),h=this.getMarkPath(x,r,N,m*z,g,f),n?n.animate({d:h,opacity:c}):this.mark=f.path(h).attr({stroke:t,"stroke-width":m,opacity:c}).add(d.axisGroup);if(i&&!isNaN(x))i.xy=r=this.getLabelPosition(x,r,i,g,k,u,a,ga),this.isFirst&&!this.isLast&&!p(e.showFirstLabel,1)||this.isLast&& +!this.isFirst&&!p(e.showLastLabel,1)?q=!1:g&&!d.isRadial&&!k.step&&!k.rotation&&!b&&c!==0&&this.handleOverflow(r),ga&&a%ga&&(q=!1),q&&!isNaN(r.y)?(r.opacity=c,i[this.isNew?"attr":"animate"](r),this.isNew=!1):i.attr("y",-9999)},destroy:function(){Qa(this,this.axis)}};A.PlotLineOrBand=function(a,b){this.axis=a;if(b)this.options=b,this.id=b.id};A.PlotLineOrBand.prototype={render:function(){var a=this,b=a.axis,c=b.horiz,d=a.options,e=d.label,f=a.label,g=d.width,h=d.to,i=d.from,j=q(i)&&q(h),k=d.value, +l=d.dashStyle,m=a.svgElem,n=[],v,s=d.color,p=d.zIndex,o=d.events,t={},w=b.chart.renderer;b.isLog&&(i=Ea(i),h=Ea(h),k=Ea(k));if(g){if(n=b.getPlotLinePath(k,g),t={stroke:s,"stroke-width":g},l)t.dashstyle=l}else if(j){n=b.getPlotBandPath(i,h,d);if(s)t.fill=s;if(d.borderWidth)t.stroke=d.borderColor,t["stroke-width"]=d.borderWidth}else return;if(q(p))t.zIndex=p;if(m)if(n)m.animate({d:n},null,m.onGetPath);else{if(m.hide(),m.onGetPath=function(){m.show()},f)a.label=f=f.destroy()}else if(n&&n.length&&(a.svgElem= +m=w.path(n).attr(t).add(),o))for(v in d=function(b){m.on(b,function(c){o[b].apply(a,[c])})},o)d(v);if(e&&q(e.text)&&n&&n.length&&b.width>0&&b.height>0){e=z({align:c&&j&&"center",x:c?!j&&4:10,verticalAlign:!c&&j&&"middle",y:c?j?16:10:j?6:-4,rotation:c&&!j&&90},e);if(!f){t={align:e.textAlign||e.align,rotation:e.rotation};if(q(p))t.zIndex=p;a.label=f=w.text(e.text,0,0,e.useHTML).attr(t).css(e.style).add()}b=[n[1],n[4],j?n[6]:n[1]];j=[n[2],n[5],j?n[7]:n[2]];n=Pa(b);c=Pa(j);f.align(e,!1,{x:n,y:c,width:Fa(b)- +n,height:Fa(j)-c});f.show()}else f&&f.hide();return a},destroy:function(){ja(this.axis.plotLinesAndBands,this);delete this.axis;Qa(this)}};var va=A.Axis=function(){this.init.apply(this,arguments)};va.prototype={defaultOptions:{dateTimeLabelFormats:{millisecond:"%H:%M:%S.%L",second:"%H:%M:%S",minute:"%H:%M",hour:"%H:%M",day:"%e. %b",week:"%e. %b",month:"%b '%y",year:"%Y"},endOnTick:!1,gridLineColor:"#D8D8D8",labels:{enabled:!0,style:{color:"#606060",cursor:"default",fontSize:"11px"},x:0,y:15},lineColor:"#C0D0E0", +lineWidth:1,minPadding:0.01,maxPadding:0.01,minorGridLineColor:"#E0E0E0",minorGridLineWidth:1,minorTickColor:"#A0A0A0",minorTickLength:2,minorTickPosition:"outside",startOfWeek:1,startOnTick:!1,tickColor:"#C0D0E0",tickLength:10,tickmarkPlacement:"between",tickPixelInterval:100,tickPosition:"outside",tickWidth:1,title:{align:"middle",style:{color:"#707070"}},type:"linear"},defaultYAxisOptions:{endOnTick:!0,gridLineWidth:1,tickPixelInterval:72,showLastLabel:!0,labels:{x:-8,y:3},lineWidth:0,maxPadding:0.05, +minPadding:0.05,startOnTick:!0,tickWidth:0,title:{rotation:270,text:"Values"},stackLabels:{enabled:!1,formatter:function(){return A.numberFormat(this.total,-1)},style:z(ba.line.dataLabels.style,{color:"#000000"})}},defaultLeftAxisOptions:{labels:{x:-15,y:null},title:{rotation:270}},defaultRightAxisOptions:{labels:{x:15,y:null},title:{rotation:90}},defaultBottomAxisOptions:{labels:{autoRotation:[-45],x:0,y:null},title:{rotation:0}},defaultTopAxisOptions:{labels:{autoRotation:[-45],x:0,y:-15},title:{rotation:0}}, +init:function(a,b){var c=b.isX;this.horiz=a.inverted?!c:c;this.coll=(this.isXAxis=c)?"xAxis":"yAxis";this.opposite=b.opposite;this.side=b.side||(this.horiz?this.opposite?0:2:this.opposite?1:3);this.setOptions(b);var d=this.options,e=d.type;this.labelFormatter=d.labels.formatter||this.defaultLabelFormatter;this.userOptions=b;this.minPixelPadding=0;this.chart=a;this.reversed=d.reversed;this.zoomEnabled=d.zoomEnabled!==!1;this.categories=d.categories||e==="category";this.names=this.names||[];this.isLog= +e==="logarithmic";this.isDatetimeAxis=e==="datetime";this.isLinked=q(d.linkedTo);this.ticks={};this.labelEdge=[];this.minorTicks={};this.plotLinesAndBands=[];this.alternateBands={};this.len=0;this.minRange=this.userMinRange=d.minRange||d.maxZoom;this.range=d.range;this.offset=d.offset||0;this.stacks={};this.oldStacks={};this.min=this.max=null;this.crosshair=p(d.crosshair,sa(a.options.tooltip.crosshairs)[c?0:1],!1);var f,d=this.options.events;Ma(this,a.axes)===-1&&(c&&!this.isColorAxis?a.axes.splice(a.xAxis.length, +0,this):a.axes.push(this),a[this.coll].push(this));this.series=this.series||[];if(a.inverted&&c&&this.reversed===y)this.reversed=!0;this.removePlotLine=this.removePlotBand=this.removePlotBandOrLine;for(f in d)H(this,f,d[f]);if(this.isLog)this.val2lin=Ea,this.lin2val=ia},setOptions:function(a){this.options=z(this.defaultOptions,this.isXAxis?{}:this.defaultYAxisOptions,[this.defaultTopAxisOptions,this.defaultRightAxisOptions,this.defaultBottomAxisOptions,this.defaultLeftAxisOptions][this.side],z(T[this.coll], +a))},defaultLabelFormatter:function(){var a=this.axis,b=this.value,c=a.categories,d=this.dateTimeLabelFormat,e=T.lang.numericSymbols,f=e&&e.length,g,h=a.options.labels.format,a=a.isLog?b:a.tickInterval;if(h)g=Ja(h,this);else if(c)g=b;else if(d)g=Oa(d,b);else if(f&&a>=1E3)for(;f--&&g===y;)c=Math.pow(1E3,f+1),a>=c&&b*10%c===0&&e[f]!==null&&(g=A.numberFormat(b/c,-1)+e[f]);g===y&&(g=O(b)>=1E4?A.numberFormat(b,-1):A.numberFormat(b,-1,y,""));return g},getSeriesExtremes:function(){var a=this,b=a.chart;a.hasVisibleSeries= +!1;a.dataMin=a.dataMax=a.ignoreMinPadding=a.ignoreMaxPadding=null;a.buildStacks&&a.buildStacks();o(a.series,function(c){if(c.visible||!b.options.chart.ignoreHiddenSeries){var d;d=c.options.threshold;var e;a.hasVisibleSeries=!0;a.isLog&&d<=0&&(d=null);if(a.isXAxis){if(d=c.xData,d.length)a.dataMin=C(p(a.dataMin,d[0]),Pa(d)),a.dataMax=u(p(a.dataMax,d[0]),Fa(d))}else{c.getExtremes();e=c.dataMax;c=c.dataMin;if(q(c)&&q(e))a.dataMin=C(p(a.dataMin,c),c),a.dataMax=u(p(a.dataMax,e),e);if(q(d))if(a.dataMin>= +d)a.dataMin=d,a.ignoreMinPadding=!0;else if(a.dataMaxc)d?a=C(u(b,a),c):m=!0;return a},e=p(e,this.translate(a,null,null,c)),a=c=r(e+i);i=j=r(k-e-i);isNaN(e)?m=!0:this.horiz?(i=h,j=k-this.bottom,a=c=n(a, +g,g+this.width)):(a=g,c=l-this.right,i=j=n(i,h,h+this.height));return m&&!d?null:f.renderer.crispLine(["M",a,i,"L",c,j],b||1)},getLinearTickPositions:function(a,b,c){var d,e=ea(V(b/a)*a),f=ea(ta(c/a)*a),g=[];if(b===c&&ra(b))return[b];for(b=e;b<=f;){g.push(b);b=ea(b+a);if(b===d)break;d=b}return g},getMinorTickPositions:function(){var a=this.options,b=this.tickPositions,c=this.minorTickInterval,d=[],e,f=this.min;e=this.max;var g=e-f;if(g&&g/c=this.minRange,f,g,h,i,j;if(this.isXAxis&&this.minRange===y&&!this.isLog)q(a.min)||q(a.max)?this.minRange=null:(o(this.series,function(a){i=a.xData;for(g=j=a.xIncrement?1: +i.length-1;g>0;g--)if(h=i[g]-i[g-1],f===y||hc&&(h=0);d=u(d,h);b.single||(f=u(f,Da(j)?0:h/2),g=u(g,j==="on"?0:h));!a.noSharedTooltip&&q(v)&&(e=q(e)?C(e,v):v)}),h=b.ordinalSlope&&e?b.ordinalSlope/e:1,b.minPointOffset=f*=h,b.pointRangePadding=g*=h,b.pointRange=C(d,c),k)b.closestPointRange=e;if(a)b.oldTransA=j;b.translationSlope=b.transA=j=b.len/(c+g||1);b.transB=b.horiz?b.left:b.bottom;b.minPixelPadding= +j*f},setTickInterval:function(a){var b=this,c=b.chart,d=b.options,e=b.isLog,f=b.isDatetimeAxis,g=b.isXAxis,h=b.isLinked,i=d.maxPadding,j=d.minPadding,k=d.tickInterval,l=d.tickPixelInterval,m=b.categories;!f&&!m&&!h&&this.getTickAmount();h?(b.linkedParent=c[b.coll][d.linkedTo],c=b.linkedParent.getExtremes(),b.min=p(c.min,c.dataMin),b.max=p(c.max,c.dataMax),d.type!==b.linkedParent.options.type&&la(11,1)):(b.min=p(b.userMin,d.min,b.dataMin),b.max=p(b.userMax,d.max,b.dataMax));if(e)!a&&C(b.min,p(b.dataMin, +b.min))<=0&&la(10,1),b.min=ea(Ea(b.min)),b.max=ea(Ea(b.max));if(b.range&&q(b.max))b.userMin=b.min=u(b.min,b.max-b.range),b.userMax=b.max,b.range=null;b.beforePadding&&b.beforePadding();b.adjustForMinRange();if(!m&&!b.axisPointRange&&!b.usePercentage&&!h&&q(b.min)&&q(b.max)&&(c=b.max-b.min)){if(!q(d.min)&&!q(b.userMin)&&j&&(b.dataMin<0||!b.ignoreMinPadding))b.min-=c*j;if(!q(d.max)&&!q(b.userMax)&&i&&(b.dataMax>0||!b.ignoreMaxPadding))b.max+=c*i}if(ra(d.floor))b.min=u(b.min,d.floor);if(ra(d.ceiling))b.max= +C(b.max,d.ceiling);b.tickInterval=b.min===b.max||b.min===void 0||b.max===void 0?1:h&&!k&&l===b.linkedParent.options.tickPixelInterval?k=b.linkedParent.tickInterval:p(k,this.tickAmount?(b.max-b.min)/u(this.tickAmount-1,1):void 0,m?1:(b.max-b.min)*l/u(b.len,l));g&&!a&&o(b.series,function(a){a.processData(b.min!==b.oldMin||b.max!==b.oldMax)});b.setAxisTranslation(!0);b.beforeSetTickPositions&&b.beforeSetTickPositions();if(b.postProcessTickInterval)b.tickInterval=b.postProcessTickInterval(b.tickInterval); +if(b.pointRange)b.tickInterval=u(b.pointRange,b.tickInterval);a=p(d.minTickInterval,b.isDatetimeAxis&&b.closestPointRange);if(!k&&b.tickInterval0.5&&b.tickInterval<5&&b.max>1E3&&b.max<9999)),!!this.tickAmount);if(!this.tickAmount&&this.len)b.tickInterval=b.unsquish();this.setTickPositions()},setTickPositions:function(){var a=this.options,b,c=a.tickPositions,d=a.tickPositioner, +e=a.startOnTick,f=a.endOnTick,g;this.tickmarkOffset=this.categories&&a.tickmarkPlacement==="between"&&this.tickInterval===1?0.5:0;this.minorTickInterval=a.minorTickInterval==="auto"&&this.tickInterval?this.tickInterval/5:a.minorTickInterval;this.tickPositions=b=c&&c.slice();if(!b&&(this.tickPositions=b=this.isDatetimeAxis?this.getTimeTicks(this.normalizeTimeTickInterval(this.tickInterval,a.units),this.min,this.max,a.startOfWeek,this.ordinalPositions,this.closestPointRange,!0):this.isLog?this.getLogTickPositions(this.tickInterval, +this.min,this.max):this.getLinearTickPositions(this.tickInterval,this.min,this.max),d&&(d=d.apply(this,[this.min,this.max]))))this.tickPositions=b=d;if(!this.isLinked)this.trimTicks(b,e,f),this.min===this.max&&q(this.min)&&!this.tickAmount&&(g=!0,this.min-=0.5,this.max+=0.5),this.single=g,!c&&!d&&this.adjustTickAmount()},trimTicks:function(a,b,c){var d=a[0],e=a[a.length-1],f=this.minPointOffset||0;b?this.min=d:this.min-f>d&&a.shift();c?this.max=e:this.max+fc&&(this.tickInterval*=2,this.setTickPositions());if(q(d)){for(a=c=b.length;a--;)(d===3&&a%2===1||d<=2&&a>0&&a=u(d,p(e.max,d))&&(b=y));this.displayBtn=a!==y||b!==y;this.setExtremes(a, +b,!1,y,{trigger:"zoom"});return!0},setAxisSize:function(){var a=this.chart,b=this.options,c=b.offsetLeft||0,d=this.horiz,e=p(b.width,a.plotWidth-c+(b.offsetRight||0)),f=p(b.height,a.plotHeight),g=p(b.top,a.plotTop),b=p(b.left,a.plotLeft+c),c=/%$/;c.test(f)&&(f=parseFloat(f)/100*a.plotHeight);c.test(g)&&(g=parseFloat(g)/100*a.plotHeight+a.plotTop);this.left=b;this.top=g;this.width=e;this.height=f;this.bottom=a.chartHeight-f-g;this.right=a.chartWidth-e-b;this.len=u(d?e:f,0);this.pos=d?b:g},getExtremes:function(){var a= +this.isLog;return{min:a?ea(ia(this.min)):this.min,max:a?ea(ia(this.max)):this.max,dataMin:this.dataMin,dataMax:this.dataMax,userMin:this.userMin,userMax:this.userMax}},getThreshold:function(a){var b=this.isLog,c=b?ia(this.min):this.min,b=b?ia(this.max):this.max;a===null?a=b<0?b:c:c>a?a=c:b15&&a<165?"right":a>195&&a<345?"left":"center"},unsquish:function(){var a=this.ticks,b=this.options.labels, +c=this.horiz,d=this.tickInterval,e=d,f=this.len/(((this.categories?1:0)+this.max-this.min)/d),g,h=b.rotation,i=this.chart.renderer.fontMetrics(b.style.fontSize,a[0]&&a[0].label),j,k=Number.MAX_VALUE,l,m=function(a){a/=f||1;a=a>1?ta(a):1;return a*d};c?(l=q(h)?[h]:f=-90&&a<=90)j=m(O(i.h/aa(ha*a))),b=j+O(a/360),bm)m=a.labelLength}), +m>j&&m>g.h?k.rotation=this.labelRotation:this.labelRotation=0;else if(i&&(l={width:j+"px"},!h)){l.textOverflow="clip";for(i=c.length;!f&&i--;)if(j=c[i],j=d[j].label)if(j.styles.textOverflow==="ellipsis"&&j.css({textOverflow:"clip"}),j.getBBox().height>this.len/c.length-(g.h-g.f))j.specCss={textOverflow:"ellipsis"}}if(k.rotation&&(l={width:(m>a.chartHeight*0.5?a.chartHeight*0.33:a.chartHeight)+"px"},!h))l.textOverflow="ellipsis";this.labelAlign=k.align=e.align||this.autoLabelAlign(this.labelRotation); +o(c,function(a){var b=(a=d[a])&&a.label;if(b)l&&b.css(z(l,b.specCss)),delete b.specCss,b.attr(k),a.rotation=k.rotation});this.tickRotCorr=b.rotCorr(g.b,this.labelRotation||0,this.side===2)},hasData:function(){return this.hasVisibleSeries||q(this.min)&&q(this.max)&&!!this.tickPositions},getOffset:function(){var a=this,b=a.chart,c=b.renderer,d=a.options,e=a.tickPositions,f=a.ticks,g=a.horiz,h=a.side,i=b.inverted?[1,0,3,2][h]:h,j,k,l=0,m,n=0,v=d.title,s=d.labels,S=0,N=b.axisOffset,b=b.clipOffset,t=[-1, +1,1,-1][h],w;j=a.hasData();a.showAxis=k=j||p(d.showEmpty,!0);a.staggerLines=a.horiz&&s.staggerLines;if(!a.axisGroup)a.gridGroup=c.g("grid").attr({zIndex:d.gridZIndex||1}).add(),a.axisGroup=c.g("axis").attr({zIndex:d.zIndex||2}).add(),a.labelGroup=c.g("axis-labels").attr({zIndex:s.zIndex||7}).addClass("highcharts-"+a.coll.toLowerCase()+"-labels").add();if(j||a.isLinked){if(o(e,function(b){f[b]?f[b].addLabel():f[b]=new Ta(a,b)}),a.renderUnsquish(),o(e,function(b){if(h===0||h===2||{1:"left",3:"right"}[h]=== +a.labelAlign)S=u(f[b].getLabelSize(),S)}),a.staggerLines)S*=a.staggerLines,a.labelOffset=S}else for(w in f)f[w].destroy(),delete f[w];if(v&&v.text&&v.enabled!==!1){if(!a.axisTitle)a.axisTitle=c.text(v.text,0,0,v.useHTML).attr({zIndex:7,rotation:v.rotation||0,align:v.textAlign||{low:"left",middle:"center",high:"right"}[v.align]}).addClass("highcharts-"+this.coll.toLowerCase()+"-title").css(v.style).add(a.axisGroup),a.axisTitle.isNew=!0;if(k)l=a.axisTitle.getBBox()[g?"height":"width"],m=v.offset,n= +q(m)?0:p(v.margin,g?5:10);a.axisTitle[k?"show":"hide"]()}a.offset=t*p(d.offset,N[h]);a.tickRotCorr=a.tickRotCorr||{x:0,y:0};c=h===2?a.tickRotCorr.y:0;g=S+n+(S&&t*(g?p(s.y,a.tickRotCorr.y+8):s.x)-c);a.axisTitleMargin=p(m,g);N[h]=u(N[h],a.axisTitleMargin+l+t*a.offset,g);l=V(d.lineWidth/2)*2;d.offset&&(l=u(0,l-d.offset));b[i]=u(b[i],l)},getLinePath:function(a){var b=this.chart,c=this.opposite,d=this.offset,e=this.horiz,f=this.left+(c?this.width:0)+d,d=b.chartHeight-this.bottom-(c?this.height:0)+d;c&& +(a*=-1);return b.renderer.crispLine(["M",e?this.left:f,e?d:this.top,"L",e?b.chartWidth-this.right:f,e?d:b.chartHeight-this.bottom],a)},getTitlePosition:function(){var a=this.horiz,b=this.left,c=this.top,d=this.len,e=this.options.title,f=a?b:c,g=this.opposite,h=this.offset,i=e.x||0,j=e.y||0,k=D(e.style.fontSize||12),d={low:f+(a?0:d),middle:f+d/2,high:f+(a?d:0)}[e.align],b=(a?c+this.height:b)+(a?1:-1)*(g?-1:1)*this.axisTitleMargin+(this.side===2?k:0);return{x:a?d+i:b+(g?this.width:0)+h+i,y:a?b+j-(g? +this.height:0)+h:d+j}},render:function(){var a=this,b=a.chart,c=b.renderer,d=a.options,e=a.isLog,f=a.isLinked,g=a.tickPositions,h=a.axisTitle,i=a.ticks,j=a.minorTicks,k=a.alternateBands,l=d.stackLabels,m=d.alternateGridColor,n=a.tickmarkOffset,v=d.lineWidth,s,p=b.hasRendered&&q(a.oldMin)&&!isNaN(a.oldMin),N=a.showAxis,t,w;a.labelEdge.length=0;a.overlap=!1;o([i,j,k],function(a){for(var b in a)a[b].isActive=!1});if(a.hasData()||f){a.minorTickInterval&&!a.categories&&o(a.getMinorTickPositions(),function(b){j[b]|| +(j[b]=new Ta(a,b,"minor"));p&&j[b].isNew&&j[b].render(null,!0);j[b].render(null,!1,1)});if(g.length&&(o(g,function(b,c){if(!f||b>=a.min&&b<=a.max)i[b]||(i[b]=new Ta(a,b)),p&&i[b].isNew&&i[b].render(c,!0,0.1),i[b].render(c)}),n&&(a.min===0||a.single)))i[-1]||(i[-1]=new Ta(a,-1,null,!0)),i[-1].render(-1);m&&o(g,function(b,c){if(c%2===0&&b=E.second?0:k*V(i.getMilliseconds()/k));if(j>=E.second)i[Fb](j>=E.minute?0:k*V(i.getSeconds()/k));if(j>=E.minute)i[Gb](j>=E.hour?0:k*V(i[sb]()/k));if(j>=E.hour)i[Hb](j>= +E.day?0:k*V(i[tb]()/k));if(j>=E.day)i[vb](j>=E.month?1:k*V(i[Xa]()/k));j>=E.month&&(i[wb](j>=E.year?0:k*V(i[Ya]()/k)),h=i[Za]());j>=E.year&&(h-=h%k,i[xb](h));if(j===E.week)i[vb](i[Xa]()-i[ub]()+p(d,1));b=1;if(ob||eb)i=i.getTime(),i=new Aa(i+Wa(i));h=i[Za]();for(var d=i.getTime(),l=i[Ya](),m=i[Xa](),n=(E.day+(g?Wa(i):i.getTimezoneOffset()*6E4))%E.day;d=0.5)a=r(a),g=this.getLinearTickPositions(a,b,c);else if(a>=0.08)for(var f=V(b),h,i,j,k,l,e=a>0.3?[1,2,4]:a>0.15?[1,2,4,6,8]:[1,2,3,4,5,6,7,8,9];fb&&(!d||k<=c)&&k!==y&&g.push(k),k>c&&(l=!0), +k=j}else if(b=ia(b),c=ia(c),a=e[d?"minorTickInterval":"tickInterval"],a=p(a==="auto"?null:a,this._minorAutoInterval,(c-b)*(e.tickPixelInterval/(d?5:1))/((d?f/this.tickPositions.length:f)||1)),a=qb(a,null,pb(a)),g=Ua(this.getLinearTickPositions(a,b,c),Ea),!d)this._minorAutoInterval=a/5;if(!d)this.tickInterval=a;return g};var Nb=A.Tooltip=function(){this.init.apply(this,arguments)};Nb.prototype={init:function(a,b){var c=b.borderWidth,d=b.style,e=D(d.padding);this.chart=a;this.options=b;this.crosshairs= +[];this.now={x:0,y:0};this.isHidden=!0;this.label=a.renderer.label("",0,0,b.shape||"callout",null,null,b.useHTML,null,"tooltip").attr({padding:e,fill:b.backgroundColor,"stroke-width":c,r:b.borderRadius,zIndex:8}).css(d).css({padding:0}).add().attr({y:-9999});fa||this.label.shadow(b.shadow);this.shared=b.shared},destroy:function(){if(this.label)this.label=this.label.destroy();clearTimeout(this.hideTimer);clearTimeout(this.tooltipTimeout)},move:function(a,b,c,d){var e=this,f=e.now,g=e.options.animation!== +!1&&!e.isHidden&&(O(a-f.x)>1||O(b-f.y)>1),h=e.followPointer||e.len>1;x(f,{x:g?(2*f.x+a)/3:a,y:g?(f.y+b)/2:b,anchorX:h?y:g?(2*f.anchorX+c)/3:c,anchorY:h?y:g?(f.anchorY+d)/2:d});e.label.attr(f);if(g)clearTimeout(this.tooltipTimeout),this.tooltipTimeout=setTimeout(function(){e&&e.move(a,b,c,d)},32)},hide:function(a){var b=this;clearTimeout(this.hideTimer);if(!this.isHidden)this.hideTimer=setTimeout(function(){b.label.fadeOut();b.isHidden=!0},p(a,this.options.hideDelay,500))},getAnchor:function(a,b){var c, +d=this.chart,e=d.inverted,f=d.plotTop,g=d.plotLeft,h=0,i=0,j,k,a=sa(a);c=a[0].tooltipPos;this.followPointer&&b&&(b.chartX===y&&(b=d.pointer.normalize(b)),c=[b.chartX-d.plotLeft,b.chartY-f]);c||(o(a,function(a){j=a.series.yAxis;k=a.series.xAxis;h+=a.plotX+(!e&&k?k.left-g:0);i+=(a.plotLow?(a.plotLow+a.plotHigh)/2:a.plotY)+(!e&&j?j.top-f:0)}),h/=a.length,i/=a.length,c=[e?d.plotWidth-i:h,this.shared&&!e&&a.length>1&&b?b.chartY-f:e?d.plotHeight-h:i]);return Ua(c,r)},getPosition:function(a,b,c){var d=this.chart, +e=this.distance,f={},g=c.h||0,h,i=["y",d.chartHeight,b,c.plotY+d.plotTop],j=["x",d.chartWidth,a,c.plotX+d.plotLeft],k=p(c.ttBelow,d.inverted&&!c.negative||!d.inverted&&c.negative),l=function(a,b,c,d){var h=cb?d:d+g;else return!1},m=function(a,b,c,d){if(db-e)return!1;else f[a]=db-c/2?b-c-2:d-c/2},n=function(a){var b=i;i=j;j=b;h=a},v=function(){l.apply(0,i)!==!1?m.apply(0,j)=== +!1&&!h&&(n(!0),v()):h?f.x=f.y=0:(n(!0),v())};(d.inverted||this.len>1)&&n();v();return f},defaultFormatter:function(a){var b=this.points||sa(this),c;c=[a.tooltipFooterHeaderFormatter(b[0])];c=c.concat(a.bodyFormatter(b));c.push(a.tooltipFooterHeaderFormatter(b[0],!0));return c.join("")},refresh:function(a,b){var c=this.chart,d=this.label,e=this.options,f,g,h,i={},j,k=[];j=e.formatter||this.defaultFormatter;var i=c.hoverPoints,l,m=this.shared;clearTimeout(this.hideTimer);this.followPointer=sa(a)[0].series.tooltipOptions.followPointer; +h=this.getAnchor(a,b);f=h[0];g=h[1];m&&(!a.series||!a.series.noSharedTooltip)?(c.hoverPoints=a,i&&o(i,function(a){a.setState()}),o(a,function(a){a.setState("hover");k.push(a.getLabelConfig())}),i={x:a[0].category,y:a[0].y},i.points=k,this.len=k.length,a=a[0]):i=a.getLabelConfig();j=j.call(i,this);i=a.series;this.distance=p(i.tooltipOptions.distance,16);j===!1?this.hide():(this.isHidden&&(db(d),d.attr("opacity",1).show()),d.attr({text:j}),l=e.borderColor||a.color||i.color||"#606060",d.attr({stroke:l}), +this.updatePosition({plotX:f,plotY:g,negative:a.negative,ttBelow:a.ttBelow,h:h[2]||0}),this.isHidden=!1);I(c,"tooltipRefresh",{text:j,x:f+c.plotLeft,y:g+c.plotTop,borderColor:l})},updatePosition:function(a){var b=this.chart,c=this.label,c=(this.options.positioner||this.getPosition).call(this,c.width,c.height,a);this.move(r(c.x),r(c.y||0),a.plotX+b.plotLeft,a.plotY+b.plotTop)},getXDateFormat:function(a,b,c){var d,b=b.dateTimeLabelFormats,e=c&&c.closestPointRange,f,g={millisecond:15,second:12,minute:9, +hour:6,day:3},h,i="millisecond";if(e){h=Oa("%m-%d %H:%M:%S.%L",a.x);for(f in E){if(e===E.week&&+Oa("%w",a.x)===c.options.startOfWeek&&h.substr(6)==="00:00:00.000"){f="week";break}else if(E[f]>e){f=i;break}else if(g[f]&&h.substr(g[f])!=="01-01 00:00:00.000".substr(g[f]))break;f!=="week"&&(i=f)}f&&(d=b[f])}else d=b.day;return d||b.year},tooltipFooterHeaderFormatter:function(a,b){var c=b?"footer":"header",d=a.series,e=d.tooltipOptions,f=e.xDateFormat,g=d.xAxis,h=g&&g.options.type==="datetime"&&ra(a.key), +c=e[c+"Format"];h&&!f&&(f=this.getXDateFormat(a,e,g));h&&f&&(c=c.replace("{point.key}","{point.key:"+f+"}"));return Ja(c,{point:a,series:d})},bodyFormatter:function(a){return Ua(a,function(a){var c=a.series.tooltipOptions;return(c.pointFormatter||a.point.tooltipFormatter).call(a.point,c.pointFormat)})}};var pa;ab=B.documentElement.ontouchstart!==y;var Va=A.Pointer=function(a,b){this.init(a,b)};Va.prototype={init:function(a,b){var c=b.chart,d=c.events,e=fa?"":c.zoomType,c=a.inverted,f;this.options= +b;this.chart=a;this.zoomX=f=/x/.test(e);this.zoomY=e=/y/.test(e);this.zoomHor=f&&!c||e&&c;this.zoomVert=e&&!c||f&&c;this.hasZoom=f||e;this.runChartClick=d&&!!d.click;this.pinchDown=[];this.lastValidTouch={};if(A.Tooltip&&b.tooltip.enabled)a.tooltip=new Nb(a,b.tooltip),this.followTouchMove=p(b.tooltip.followTouchMove,!0);this.setDOMEvents()},normalize:function(a,b){var c,d,a=a||window.event,a=Tb(a);if(!a.target)a.target=a.srcElement;d=a.touches?a.touches.length?a.touches.item(0):a.changedTouches[0]: +a;if(!b)this.chartPosition=b=Sb(this.chart.container);d.pageX===y?(c=u(a.x,a.clientX-b.left),d=a.y):(c=d.pageX-b.left,d=d.pageY-b.top);return x(a,{chartX:r(c),chartY:r(d)})},getCoordinates:function(a){var b={xAxis:[],yAxis:[]};o(this.chart.axes,function(c){b[c.isXAxis?"xAxis":"yAxis"].push({axis:c,value:c.toValue(a[c.horiz?"chartX":"chartY"])})});return b},runPointActions:function(a){var b=this.chart,c=b.series,d=b.tooltip,e=d?d.shared:!1,f=b.hoverPoint,g=b.hoverSeries,h,i=b.chartWidth,j,k,l=[],m, +n;if(!e&&!g)for(h=0;hh+j&&(d=h+j);ei+k&&(e=i+k);this.hasDragged=Math.sqrt(Math.pow(m-d,2)+Math.pow(n-e,2));if(this.hasDragged>10){l=b.isInsidePlot(m-h,n-i);if(b.hasCartesianSeries&&(this.zoomX||this.zoomY)&&l&&!v&&!this.selectionMarker)this.selectionMarker= +b.renderer.rect(h,i,f?1:j,g?1:k,0).attr({fill:c.selectionMarkerFill||"rgba(69,114,167,0.25)",zIndex:7}).add();this.selectionMarker&&f&&(d-=m,this.selectionMarker.attr({width:O(d),x:(d>0?0:d)+m}));this.selectionMarker&&g&&(d=e-n,this.selectionMarker.attr({height:O(d),y:(d>0?0:d)+n}));l&&!this.selectionMarker&&c.panning&&b.pan(a,c.panning)}},drop:function(a){var b=this,c=this.chart,d=this.hasPinched;if(this.selectionMarker){var e={xAxis:[],yAxis:[],originalEvent:a.originalEvent||a},f=this.selectionMarker, +g=f.attr?f.attr("x"):f.x,h=f.attr?f.attr("y"):f.y,i=f.attr?f.attr("width"):f.width,j=f.attr?f.attr("height"):f.height,k;if(this.hasDragged||d)o(c.axes,function(c){if(c.zoomEnabled&&q(c.min)&&(d||b[{xAxis:"zoomX",yAxis:"zoomY"}[c.coll]])){var f=c.horiz,n=a.type==="touchend"?c.minPixelPadding:0,v=c.toValue((f?g:h)+n),f=c.toValue((f?g+i:h+j)-n);e[c.coll].push({axis:c,min:C(v,f),max:u(v,f)});k=!0}}),k&&I(c,"selection",e,function(a){c.zoom(x(a,d?{animation:!1}:null))});this.selectionMarker=this.selectionMarker.destroy(); +d&&this.scaleGroups()}if(c)L(c.container,{cursor:c._cursor}),c.cancelClick=this.hasDragged>10,c.mouseIsDown=this.hasDragged=this.hasPinched=!1,this.pinchDown=[]},onContainerMouseDown:function(a){a=this.normalize(a);a.preventDefault&&a.preventDefault();this.dragStart(a)},onDocumentMouseUp:function(a){Y[pa]&&Y[pa].pointer.drop(a)},onDocumentMouseMove:function(a){var b=this.chart,c=this.chartPosition,a=this.normalize(a,c);c&&!this.inClass(a.target,"highcharts-tracker")&&!b.isInsidePlot(a.chartX-b.plotLeft, +a.chartY-b.plotTop)&&this.reset()},onContainerMouseLeave:function(){var a=Y[pa];if(a)a.pointer.reset(),a.pointer.chartPosition=null},onContainerMouseMove:function(a){var b=this.chart;pa=b.index;a=this.normalize(a);a.returnValue=!1;b.mouseIsDown==="mousedown"&&this.drag(a);(this.inClass(a.target,"highcharts-tracker")||b.isInsidePlot(a.chartX-b.plotLeft,a.chartY-b.plotTop))&&!b.openMenu&&this.runPointActions(a)},inClass:function(a,b){for(var c;a;){if(c=J(a,"class"))if(c.indexOf(b)!==-1)return!0;else if(c.indexOf("highcharts-container")!== +-1)return!1;a=a.parentNode}},onTrackerMouseOut:function(a){var b=this.chart.hoverSeries,c=(a=a.relatedTarget||a.toElement)&&a.point&&a.point.series;if(b&&!b.options.stickyTracking&&!this.inClass(a,"highcharts-tooltip")&&c!==b)b.onMouseOut()},onContainerClick:function(a){var b=this.chart,c=b.hoverPoint,d=b.plotLeft,e=b.plotTop,a=this.normalize(a);a.originalEvent=a;b.cancelClick||(c&&this.inClass(a.target,"highcharts-tracker")?(I(c.series,"click",x(a,{point:c})),b.hoverPoint&&c.firePointEvent("click", +a)):(x(a,this.getCoordinates(a)),b.isInsidePlot(a.chartX-d,a.chartY-e)&&I(b,"click",a)))},setDOMEvents:function(){var a=this,b=a.chart.container;b.onmousedown=function(b){a.onContainerMouseDown(b)};b.onmousemove=function(b){a.onContainerMouseMove(b)};b.onclick=function(b){a.onContainerClick(b)};H(b,"mouseleave",a.onContainerMouseLeave);bb===1&&H(B,"mouseup",a.onDocumentMouseUp);if(ab)b.ontouchstart=function(b){a.onContainerTouchStart(b)},b.ontouchmove=function(b){a.onContainerTouchMove(b)},bb===1&& +H(B,"touchend",a.onDocumentTouchEnd)},destroy:function(){var a;Z(this.chart.container,"mouseleave",this.onContainerMouseLeave);bb||(Z(B,"mouseup",this.onDocumentMouseUp),Z(B,"touchend",this.onDocumentTouchEnd));clearInterval(this.tooltipTimeout);for(a in this)this[a]=null}};x(A.Pointer.prototype,{pinchTranslate:function(a,b,c,d,e,f){(this.zoomHor||this.pinchHor)&&this.pinchTranslateDirection(!0,a,b,c,d,e,f);(this.zoomVert||this.pinchVert)&&this.pinchTranslateDirection(!1,a,b,c,d,e,f)},pinchTranslateDirection:function(a, +b,c,d,e,f,g,h){var i=this.chart,j=a?"x":"y",k=a?"X":"Y",l="chart"+k,m=a?"width":"height",n=i["plot"+(a?"Left":"Top")],v,s,p=h||1,o=i.inverted,t=i.bounds[a?"h":"v"],w=b.length===1,q=b[0][l],u=c[0][l],r=!w&&b[1][l],y=!w&&c[1][l],x,c=function(){!w&&O(q-r)>20&&(p=h||O(u-y)/O(q-r));s=(n-u)/p+q;v=i["plot"+(a?"Width":"Height")]/p};c();b=s;bt.max&&(b=t.max-v,x=!0);x?(u-=0.8*(u-g[j][0]),w||(y-=0.8*(y-g[j][1])),c()):g[j]=[u,y];o||(f[j]=s-n,f[m]=v);f=o?1/p:p;e[m]=v;e[j]=b;d[o?a?"scaleY": +"scaleX":"scale"+k]=p;d["translate"+k]=f*n+(u-f*q)},pinch:function(a){var b=this,c=b.chart,d=b.pinchDown,e=a.touches,f=e.length,g=b.lastValidTouch,h=b.hasZoom,i=b.selectionMarker,j={},k=f===1&&(b.inClass(a.target,"highcharts-tracker")&&c.runTrackerClick||b.runChartClick),l={};if(f>1)b.initiated=!0;h&&b.initiated&&!k&&a.preventDefault();Ua(e,function(a){return b.normalize(a)});if(a.type==="touchstart")o(e,function(a,b){d[b]={chartX:a.chartX,chartY:a.chartY}}),g.x=[d[0].chartX,d[1]&&d[1].chartX],g.y= +[d[0].chartY,d[1]&&d[1].chartY],o(c.axes,function(a){if(a.zoomEnabled){var b=c.bounds[a.horiz?"h":"v"],d=a.minPixelPadding,e=a.toPixels(p(a.options.min,a.dataMin)),f=a.toPixels(p(a.options.max,a.dataMax)),g=C(e,f),e=u(e,f);b.min=C(a.pos,g-d);b.max=u(a.pos+a.len,e+d)}}),b.res=!0;else if(d.length){if(!i)b.selectionMarker=i=x({destroy:na},c.plotBox);b.pinchTranslate(d,e,j,i,l,g);b.hasPinched=h;b.scaleGroups(j,l);if(!h&&b.followTouchMove&&f===1)this.runPointActions(b.normalize(a));else if(b.res)b.res= +!1,this.reset(!1,0)}},touch:function(a,b){var c=this.chart;pa=c.index;a.touches.length===1?(a=this.normalize(a),c.isInsidePlot(a.chartX-c.plotLeft,a.chartY-c.plotTop)&&!c.openMenu?(b&&this.runPointActions(a),this.pinch(a)):b&&this.reset()):a.touches.length===2&&this.pinch(a)},onContainerTouchStart:function(a){this.touch(a,!0)},onContainerTouchMove:function(a){this.touch(a)},onDocumentTouchEnd:function(a){Y[pa]&&Y[pa].pointer.drop(a)}});if(K.PointerEvent||K.MSPointerEvent){var wa={},Bb=!!K.PointerEvent, +Xb=function(){var a,b=[];b.item=function(a){return this[a]};for(a in wa)wa.hasOwnProperty(a)&&b.push({pageX:wa[a].pageX,pageY:wa[a].pageY,target:wa[a].target});return b},Cb=function(a,b,c,d){a=a.originalEvent||a;if((a.pointerType==="touch"||a.pointerType===a.MSPOINTER_TYPE_TOUCH)&&Y[pa])d(a),d=Y[pa].pointer,d[b]({type:c,target:a.currentTarget,preventDefault:na,touches:Xb()})};x(Va.prototype,{onContainerPointerDown:function(a){Cb(a,"onContainerTouchStart","touchstart",function(a){wa[a.pointerId]={pageX:a.pageX, +pageY:a.pageY,target:a.currentTarget}})},onContainerPointerMove:function(a){Cb(a,"onContainerTouchMove","touchmove",function(a){wa[a.pointerId]={pageX:a.pageX,pageY:a.pageY};if(!wa[a.pointerId].target)wa[a.pointerId].target=a.currentTarget})},onDocumentPointerUp:function(a){Cb(a,"onDocumentTouchEnd","touchend",function(a){delete wa[a.pointerId]})},batchMSEvents:function(a){a(this.chart.container,Bb?"pointerdown":"MSPointerDown",this.onContainerPointerDown);a(this.chart.container,Bb?"pointermove": +"MSPointerMove",this.onContainerPointerMove);a(B,Bb?"pointerup":"MSPointerUp",this.onDocumentPointerUp)}});cb(Va.prototype,"init",function(a,b,c){a.call(this,b,c);this.hasZoom&&L(b.container,{"-ms-touch-action":P,"touch-action":P})});cb(Va.prototype,"setDOMEvents",function(a){a.apply(this);(this.hasZoom||this.followTouchMove)&&this.batchMSEvents(H)});cb(Va.prototype,"destroy",function(a){this.batchMSEvents(Z);a.call(this)})}var nb=A.Legend=function(a,b){this.init(a,b)};nb.prototype={init:function(a, +b){var c=this,d=b.itemStyle,e=b.itemMarginTop||0;this.options=b;if(b.enabled)c.itemStyle=d,c.itemHiddenStyle=z(d,b.itemHiddenStyle),c.itemMarginTop=e,c.padding=d=p(b.padding,8),c.initialItemX=d,c.initialItemY=d-5,c.maxItemWidth=0,c.chart=a,c.itemHeight=0,c.symbolWidth=p(b.symbolWidth,16),c.pages=[],c.render(),H(c.chart,"endResize",function(){c.positionCheckboxes()})},colorizeItem:function(a,b){var c=this.options,d=a.legendItem,e=a.legendLine,f=a.legendSymbol,g=this.itemHiddenStyle.color,c=b?c.itemStyle.color: +g,h=b?a.legendColor||a.color||"#CCC":g,g=a.options&&a.options.marker,i={fill:h},j;d&&d.css({fill:c,color:c});e&&e.attr({stroke:h});if(f){if(g&&f.isMarker)for(j in i.stroke=h,g=a.convertAttribs(g),g)d=g[j],d!==y&&(i[j]=d);f.attr(i)}},positionItem:function(a){var b=this.options,c=b.symbolPadding,b=!b.rtl,d=a._legendItemPos,e=d[0],d=d[1],f=a.checkbox;(a=a.legendGroup)&&a.element&&a.translate(b?e:this.legendWidth-e-2*c-4,d);if(f)f.x=e,f.y=d},destroyItem:function(a){var b=a.checkbox;o(["legendItem","legendLine", +"legendSymbol","legendGroup"],function(b){a[b]&&(a[b]=a[b].destroy())});b&&Ra(a.checkbox)},destroy:function(){var a=this.group,b=this.box;if(b)this.box=b.destroy();if(a)this.group=a.destroy()},positionCheckboxes:function(a){var b=this.group.alignAttr,c,d=this.clipHeight||this.legendHeight;if(b)c=b.translateY,o(this.allItems,function(e){var f=e.checkbox,g;f&&(g=c+f.y+(a||0)+3,L(f,{left:b.translateX+e.checkboxOffset+f.x-20+"px",top:g+"px",display:g>c-6&&g(m||b.chartWidth-2*j-s-d.x))this.itemX=s,this.itemY+=v+this.lastLineHeight+n,this.lastLineHeight=0;this.maxItemWidth=u(this.maxItemWidth,f);this.lastItemY=v+this.itemY+n;this.lastLineHeight=u(g,this.lastLineHeight);a._legendItemPos=[this.itemX,this.itemY];e?this.itemX+=f:(this.itemY+=v+g+n,this.lastLineHeight=g);this.offsetWidth=m||u((e?this.itemX-s-k:f)+j,this.offsetWidth)},getAllItems:function(){var a=[];o(this.chart.series,function(b){var c=b.options;if(p(c.showInLegend,!q(c.linkedTo)? +y:!1,!0))a=a.concat(b.legendItems||(c.legendType==="point"?b.data:b))});return a},adjustMargins:function(a,b){var c=this.chart,d=this.options,e=d.align[0]+d.verticalAlign[0]+d.layout[0];this.display&&!d.floating&&o([/(lth|ct|rth)/,/(rtv|rm|rbv)/,/(rbh|cb|lbh)/,/(lbv|lm|ltv)/],function(f,g){f.test(e)&&!q(a[g])&&(c[jb[g]]=u(c[jb[g]],c.legend[(g+1)%2?"legendHeight":"legendWidth"]+[1,-1,-1,1][g]*d[g%2?"x":"y"]+p(d.margin,12)+b[g]))})},render:function(){var a=this,b=a.chart,c=b.renderer,d=a.group,e,f, +g,h,i=a.box,j=a.options,k=a.padding,l=j.borderWidth,m=j.backgroundColor;a.itemX=a.initialItemX;a.itemY=a.initialItemY;a.offsetWidth=0;a.lastItemY=0;if(!d)a.group=d=c.g("legend").attr({zIndex:7}).add(),a.contentGroup=c.g().attr({zIndex:1}).add(d),a.scrollGroup=c.g().add(a.contentGroup);a.renderTitle();e=a.getAllItems();rb(e,function(a,b){return(a.options&&a.options.legendIndex||0)-(b.options&&b.options.legendIndex||0)});j.reversed&&e.reverse();a.allItems=e;a.display=f=!!e.length;a.lastLineHeight=0; +o(e,function(b){a.renderItem(b)});g=(j.width||a.offsetWidth)+k;h=a.lastItemY+a.lastLineHeight+a.titleHeight;h=a.handleOverflow(h);h+=k;if(l||m){if(i){if(g>0&&h>0)i[i.isNew?"attr":"animate"](i.crisp({width:g,height:h})),i.isNew=!1}else a.box=i=c.rect(0,0,g,h,j.borderRadius,l||0).attr({stroke:j.borderColor,"stroke-width":l||0,fill:m||P}).add(d).shadow(j.shadow),i.isNew=!0;i[f?"show":"hide"]()}a.legendWidth=g;a.legendHeight=h;o(e,function(b){a.positionItem(b)});f&&d.align(x({width:g,height:h},j),!0, +"spacingBox");b.isResizing||this.positionCheckboxes()},handleOverflow:function(a){var b=this,c=this.chart,d=c.renderer,e=this.options,f=e.y,f=c.spacingBox.height+(e.verticalAlign==="top"?-f:f)-this.padding,g=e.maxHeight,h,i=this.clipRect,j=e.navigation,k=p(j.animation,!0),l=j.arrowSize||12,m=this.nav,n=this.pages,v=this.padding,s,q=this.allItems,N=function(a){i.attr({height:a});if(b.contentGroup.div)b.contentGroup.div.style.clip="rect("+v+"px,9999px,"+(v+a)+"px,0)"};e.layout==="horizontal"&&(f/=2); +g&&(f=C(f,g));n.length=0;if(a>f){this.clipHeight=h=u(f-20-this.titleHeight-v,0);this.currentPage=p(this.currentPage,1);this.fullHeight=a;o(q,function(a,b){var c=a._legendItemPos[1],d=r(a.legendItem.getBBox().height),e=n.length;if(!e||c-n[e-1]>h&&(s||c)!==n[e-1])n.push(s||c),e++;b===q.length-1&&c+d-n[e-1]>h&&n.push(c);c!==s&&(s=c)});if(!i)i=b.clipRect=d.clipRect(0,v,9999,0),b.contentGroup.clip(i);N(h);if(!m)this.nav=m=d.g().attr({zIndex:1}).add(this.group),this.up=d.symbol("triangle",0,0,l,l).on("click", +function(){b.scroll(-1,k)}).add(m),this.pager=d.text("",15,10).css(j.style).add(m),this.down=d.symbol("triangle-down",0,0,l,l).on("click",function(){b.scroll(1,k)}).add(m);b.scroll(0);a=f}else if(m)N(c.chartHeight),m.hide(),this.scrollGroup.attr({translateY:1}),this.clipHeight=0;return a},scroll:function(a,b){var c=this.pages,d=c.length,e=this.currentPage+a,f=this.clipHeight,g=this.options.navigation,h=g.activeColor,g=g.inactiveColor,i=this.pager,j=this.padding;e>d&&(e=d);if(e>0)b!==y&&Sa(b,this.chart), +this.nav.attr({translateX:j,translateY:f+this.padding+7+this.titleHeight,visibility:"visible"}),this.up.attr({fill:e===1?g:h}).css({cursor:e===1?"default":"pointer"}),i.attr({text:e+"/"+d}),this.down.attr({x:18+this.pager.getBBox().width,fill:e===d?g:h}).css({cursor:e===d?"default":"pointer"}),c=-c[e-1]+this.initialItemY,this.scrollGroup.animate({translateY:c}),this.currentPage=e,this.positionCheckboxes(c)}};Na=A.LegendSymbolMixin={drawRectangle:function(a,b){var c=a.options.symbolHeight||a.fontMetrics.f; +b.legendSymbol=this.chart.renderer.rect(0,a.baseline-c+1,a.symbolWidth,c,a.options.symbolRadius||0).attr({zIndex:3}).add(b.legendGroup)},drawLineMarker:function(a){var b=this.options,c=b.marker,d;d=a.symbolWidth;var e=this.chart.renderer,f=this.legendGroup,a=a.baseline-r(a.fontMetrics.b*0.3),g;if(b.lineWidth){g={"stroke-width":b.lineWidth};if(b.dashStyle)g.dashstyle=b.dashStyle;this.legendLine=e.path(["M",0,a,"L",d,a]).attr(g).add(f)}if(c&&c.enabled!==!1)b=c.radius,this.legendSymbol=d=e.symbol(this.symbol, +d/2-b,a-b,2*b,2*b).add(f),d.isMarker=!0}};(/Trident\/7\.0/.test(Ba)||La)&&cb(nb.prototype,"positionItem",function(a,b){var c=this,d=function(){b._legendItemPos&&a.call(c,b)};d();setTimeout(d)});F=A.Chart=function(){this.init.apply(this,arguments)};F.prototype={callbacks:[],init:function(a,b){var c,d=a.series;a.series=null;c=z(T,a);c.series=a.series=d;this.userOptions=a;d=c.chart;this.margin=this.splashArray("margin",d);this.spacing=this.splashArray("spacing",d);var e=d.events;this.bounds={h:{},v:{}}; +this.callback=b;this.isResizing=0;this.options=c;this.axes=[];this.series=[];this.hasCartesianSeries=d.showAxes;var f=this,g;f.index=Y.length;Y.push(f);bb++;d.reflow!==!1&&H(f,"load",function(){f.initReflow()});if(e)for(g in e)H(f,g,e[g]);f.xAxis=[];f.yAxis=[];f.animation=fa?!1:p(d.animation,!0);f.pointCount=f.colorCounter=f.symbolCounter=0;f.firstRender()},initSeries:function(a){var b=this.options.chart;(b=M[a.type||b.type||b.defaultSeriesType])||la(17,!0);b=new b;b.init(this,a);return b},isInsidePlot:function(a, +b,c){var d=c?b:a,a=c?a:b;return d>=0&&d<=this.plotWidth&&a>=0&&a<=this.plotHeight},redraw:function(a){var b=this.axes,c=this.series,d=this.pointer,e=this.legend,f=this.isDirtyLegend,g,h,i=this.hasCartesianSeries,j=this.isDirtyBox,k=c.length,l=k,m=this.renderer,n=m.isHidden(),p=[];Sa(a,this);n&&this.cloneRenderTo();for(this.layOutTitles();l--;)if(a=c[l],a.options.stacking&&(g=!0,a.isDirty)){h=!0;break}if(h)for(l=k;l--;)if(a=c[l],a.options.stacking)a.isDirty=!0;o(c,function(a){a.isDirty&&a.options.legendType=== +"point"&&(a.updateTotals&&a.updateTotals(),f=!0)});if(f&&e.options.enabled)e.render(),this.isDirtyLegend=!1;g&&this.getStacks();if(i&&!this.isResizing)this.maxTicks=null,o(b,function(a){a.setScale()});this.getMargins();i&&(o(b,function(a){a.isDirty&&(j=!0)}),o(b,function(a){if(a.isDirtyExtremes)a.isDirtyExtremes=!1,p.push(function(){I(a,"afterSetExtremes",x(a.eventArgs,a.getExtremes()));delete a.eventArgs});(j||g)&&a.redraw()}));j&&this.drawChartBox();o(c,function(a){a.isDirty&&a.visible&&(!a.isCartesian|| +a.xAxis)&&a.redraw()});d&&d.reset(!0);m.draw();I(this,"redraw");n&&this.cloneRenderTo(!0);o(p,function(a){a.call()})},get:function(a){var b=this.axes,c=this.series,d,e;for(d=0;d19?this.containerHeight:400))},cloneRenderTo:function(a){var b=this.renderToClone,c=this.container;a?b&&(this.renderTo.appendChild(c),Ra(b),delete this.renderToClone):(c&& +c.parentNode===this.renderTo&&this.renderTo.removeChild(c),this.renderToClone=b=this.renderTo.cloneNode(0),L(b,{position:"absolute",top:"-9999px",display:"block"}),b.style.setProperty&&b.style.setProperty("display","block","important"),B.body.appendChild(b),c&&b.appendChild(c))},getContainer:function(){var a,b=this.options.chart,c,d,e;this.renderTo=a=b.renderTo;e="highcharts-"+yb++;if(Da(a))this.renderTo=a=B.getElementById(a);a||la(13,!0);c=D(J(a,"data-highcharts-chart"));!isNaN(c)&&Y[c]&&Y[c].hasRendered&& +Y[c].destroy();J(a,"data-highcharts-chart",this.index);a.innerHTML="";!b.skipClone&&!a.offsetWidth&&this.cloneRenderTo();this.getChartSize();c=this.chartWidth;d=this.chartHeight;this.container=a=$(Ka,{className:"highcharts-container"+(b.className?" "+b.className:""),id:e},x({position:"relative",overflow:"hidden",width:c+"px",height:d+"px",textAlign:"left",lineHeight:"normal",zIndex:0,"-webkit-tap-highlight-color":"rgba(0,0,0,0)"},b.style),this.renderToClone||a);this._cursor=a.style.cursor;this.renderer= +b.forExport?new ua(a,c,d,b.style,!0):new $a(a,c,d,b.style);fa&&this.renderer.create(this,a,c,d);this.renderer.chartIndex=this.index},getMargins:function(a){var b=this.spacing,c=this.margin,d=this.titleOffset;this.resetMargins();if(d&&!q(c[0]))this.plotTop=u(this.plotTop,d+this.options.title.margin+b[0]);this.legend.adjustMargins(c,b);this.extraBottomMargin&&(this.marginBottom+=this.extraBottomMargin);this.extraTopMargin&&(this.plotTop+=this.extraTopMargin);a||this.getAxisMargins()},getAxisMargins:function(){var a= +this,b=a.axisOffset=[0,0,0,0],c=a.margin;a.hasCartesianSeries&&o(a.axes,function(a){a.getOffset()});o(jb,function(d,e){q(c[e])||(a[d]+=b[e])});a.setChartSize()},reflow:function(a){var b=this,c=b.options.chart,d=b.renderTo,e=c.width||kb(d,"width"),f=c.height||kb(d,"height"),c=a?a.target:K,d=function(){if(b.container)b.setSize(e,f,!1),b.hasUserSize=null};if(!b.hasUserSize&&!b.isPrinting&&e&&f&&(c===K||c===B)){if(e!==b.containerWidth||f!==b.containerHeight)clearTimeout(b.reflowTimeout),a?b.reflowTimeout= +setTimeout(d,100):d();b.containerWidth=e;b.containerHeight=f}},initReflow:function(){var a=this,b=function(b){a.reflow(b)};H(K,"resize",b);H(a,"destroy",function(){Z(K,"resize",b)})},setSize:function(a,b,c){var d=this,e,f,g;d.isResizing+=1;g=function(){d&&I(d,"endResize",null,function(){d.isResizing-=1})};Sa(c,d);d.oldChartHeight=d.chartHeight;d.oldChartWidth=d.chartWidth;if(q(a))d.chartWidth=e=u(0,r(a)),d.hasUserSize=!!e;if(q(b))d.chartHeight=f=u(0,r(b));(za?mb:L)(d.container,{width:e+"px",height:f+ +"px"},za);d.setChartSize(!0);d.renderer.setSize(e,f,c);d.maxTicks=null;o(d.axes,function(a){a.isDirty=!0;a.setScale()});o(d.series,function(a){a.isDirty=!0});d.isDirtyLegend=!0;d.isDirtyBox=!0;d.layOutTitles();d.getMargins();d.redraw(c);d.oldChartHeight=null;I(d,"resize");za===!1?g():setTimeout(g,za&&za.duration||500)},setChartSize:function(a){var b=this.inverted,c=this.renderer,d=this.chartWidth,e=this.chartHeight,f=this.options.chart,g=this.spacing,h=this.clipOffset,i,j,k,l;this.plotLeft=i=r(this.plotLeft); +this.plotTop=j=r(this.plotTop);this.plotWidth=k=u(0,r(d-i-this.marginRight));this.plotHeight=l=u(0,r(e-j-this.marginBottom));this.plotSizeX=b?l:k;this.plotSizeY=b?k:l;this.plotBorderWidth=f.plotBorderWidth||0;this.spacingBox=c.spacingBox={x:g[3],y:g[0],width:d-g[3]-g[1],height:e-g[0]-g[2]};this.plotBox=c.plotBox={x:i,y:j,width:k,height:l};d=2*V(this.plotBorderWidth/2);b=ta(u(d,h[3])/2);c=ta(u(d,h[0])/2);this.clipBox={x:b,y:c,width:V(this.plotSizeX-u(d,h[1])/2-b),height:u(0,V(this.plotSizeY-u(d,h[2])/ +2-c))};a||o(this.axes,function(a){a.setAxisSize();a.setAxisTranslation()})},resetMargins:function(){var a=this;o(jb,function(b,c){a[b]=p(a.margin[c],a.spacing[c])});a.axisOffset=[0,0,0,0];a.clipOffset=[0,0,0,0]},drawChartBox:function(){var a=this.options.chart,b=this.renderer,c=this.chartWidth,d=this.chartHeight,e=this.chartBackground,f=this.plotBackground,g=this.plotBorder,h=this.plotBGImage,i=a.borderWidth||0,j=a.backgroundColor,k=a.plotBackgroundColor,l=a.plotBackgroundImage,m=a.plotBorderWidth|| +0,n,p=this.plotLeft,o=this.plotTop,q=this.plotWidth,u=this.plotHeight,t=this.plotBox,w=this.clipRect,r=this.clipBox;n=i+(a.shadow?8:0);if(i||j)if(e)e.animate(e.crisp({width:c-n,height:d-n}));else{e={fill:j||P};if(i)e.stroke=a.borderColor,e["stroke-width"]=i;this.chartBackground=b.rect(n/2,n/2,c-n,d-n,a.borderRadius,i).attr(e).addClass("highcharts-background").add().shadow(a.shadow)}if(k)f?f.animate(t):this.plotBackground=b.rect(p,o,q,u,0).attr({fill:k}).add().shadow(a.plotShadow);if(l)h?h.animate(t): +this.plotBGImage=b.image(l,p,o,q,u).add();w?w.animate({width:r.width,height:r.height}):this.clipRect=b.clipRect(r);if(m)g?g.animate(g.crisp({x:p,y:o,width:q,height:u,strokeWidth:-m})):this.plotBorder=b.rect(p,o,q,u,0,-m).attr({stroke:a.plotBorderColor,"stroke-width":m,fill:P,zIndex:1}).add();this.isDirtyBox=!1},propFromSeries:function(){var a=this,b=a.options.chart,c,d=a.options.series,e,f;o(["inverted","angular","polar"],function(g){c=M[b.type||b.defaultSeriesType];f=a[g]||b[g]||c&&c.prototype[g]; +for(e=d&&d.length;!f&&e--;)(c=M[d[e].type])&&c.prototype[g]&&(f=!0);a[g]=f})},linkSeries:function(){var a=this,b=a.series;o(b,function(a){a.linkedSeries.length=0});o(b,function(b){var d=b.options.linkedTo;if(Da(d)&&(d=d===":previous"?a.series[b.index-1]:a.get(d)))d.linkedSeries.push(b),b.linkedParent=d})},renderSeries:function(){o(this.series,function(a){a.translate();a.render()})},renderLabels:function(){var a=this,b=a.options.labels;b.items&&o(b.items,function(c){var d=x(b.style,c.style),e=D(d.left)+ +a.plotLeft,f=D(d.top)+a.plotTop+12;delete d.left;delete d.top;a.renderer.text(c.html,e,f).attr({zIndex:2}).css(d).add()})},render:function(){var a=this.axes,b=this.renderer,c=this.options,d,e,f,g;this.setTitle();this.legend=new nb(this,c.legend);this.getStacks();this.getMargins(!0);this.setChartSize();d=this.plotWidth;e=this.plotHeight-=13;o(a,function(a){a.setScale()});this.getAxisMargins();f=d/this.plotWidth>1.1;g=e/this.plotHeight>1.1;if(f||g)this.maxTicks=null,o(a,function(a){(a.horiz&&f||!a.horiz&& +g)&&a.setTickInterval(!0)}),this.getMargins();this.drawChartBox();this.hasCartesianSeries&&o(a,function(a){a.render()});if(!this.seriesGroup)this.seriesGroup=b.g("series-group").attr({zIndex:3}).add();this.renderSeries();this.renderLabels();this.showCredits(c.credits);this.hasRendered=!0},showCredits:function(a){if(a.enabled&&!this.credits)this.credits=this.renderer.text(a.text,0,0).on("click",function(){if(a.href)location.href=a.href}).attr({align:a.position.align,zIndex:8}).css(a.style).add().align(a.position)}, +destroy:function(){var a=this,b=a.axes,c=a.series,d=a.container,e,f=d&&d.parentNode;I(a,"destroy");Y[a.index]=y;bb--;a.renderTo.removeAttribute("data-highcharts-chart");Z(a);for(e=b.length;e--;)b[e]=b[e].destroy();for(e=c.length;e--;)c[e]=c[e].destroy();o("title,subtitle,chartBackground,plotBackground,plotBGImage,plotBorder,seriesGroup,clipRect,credits,pointer,scroller,rangeSelector,legend,resetZoomButton,tooltip,renderer".split(","),function(b){var c=a[b];c&&c.destroy&&(a[b]=c.destroy())});if(d)d.innerHTML= +"",Z(d),f&&Ra(d);for(e in a)delete a[e]},isReadyToRender:function(){var a=this;return!ca&&K==K.top&&B.readyState!=="complete"||fa&&!K.canvg?(fa?Mb.push(function(){a.firstRender()},a.options.global.canvasToolsURL):B.attachEvent("onreadystatechange",function(){B.detachEvent("onreadystatechange",a.firstRender);B.readyState==="complete"&&a.firstRender()}),!1):!0},firstRender:function(){var a=this,b=a.options,c=a.callback;if(a.isReadyToRender()){a.getContainer();I(a,"init");a.resetMargins();a.setChartSize(); +a.propFromSeries();a.getAxes();o(b.series||[],function(b){a.initSeries(b)});a.linkSeries();I(a,"beforeRender");if(A.Pointer)a.pointer=new Va(a,b);a.render();a.renderer.draw();c&&c.apply(a,[a]);o(a.callbacks,function(b){a.index!==y&&b.apply(a,[a])});I(a,"load");a.cloneRenderTo(!0)}},splashArray:function(a,b){var c=b[a],c=da(c)?c:[c,c,c,c];return[p(b[a+"Top"],c[0]),p(b[a+"Right"],c[1]),p(b[a+"Bottom"],c[2]),p(b[a+"Left"],c[3])]}};var Yb=A.CenteredSeriesMixin={getCenter:function(){var a=this.options, +b=this.chart,c=2*(a.slicedOffset||0),d=b.plotWidth-2*c,b=b.plotHeight-2*c,e=a.center,e=[p(e[0],"50%"),p(e[1],"50%"),a.size||"100%",a.innerSize||0],f=C(d,b),g,h;for(g=0;g<4;++g)h=e[g],a=g<2||g===2&&/%$/.test(h),e[g]=(/%$/.test(h)?[d,b,f,e[2]][g]*parseFloat(h)/100:parseFloat(h))+(a?c:0);return e}},Ga=function(){};Ga.prototype={init:function(a,b,c){this.series=a;this.color=a.color;this.applyOptions(b,c);this.pointAttr={};if(a.options.colorByPoint&&(b=a.options.colors||a.chart.options.colors,this.color= +this.color||b[a.colorCounter++],a.colorCounter===b.length))a.colorCounter=0;a.chart.pointCount++;return this},applyOptions:function(a,b){var c=this.series,d=c.options.pointValKey||c.pointValKey,a=Ga.prototype.optionsToObject.call(this,a);x(this,a);this.options=this.options?x(this.options,a):a;if(d)this.y=this[d];if(this.x===y&&c)this.x=b===y?c.autoIncrement():b;return this},optionsToObject:function(a){var b={},c=this.series,d=c.options.keys,e=d||c.pointArrayMap||["y"],f=e.length,g=0,h=0;if(typeof a=== +"number"||a===null)b[e[0]]=a;else if(Ha(a)){if(!d&&a.length>f){c=typeof a[0];if(c==="string")b.name=a[0];else if(c==="number")b.x=a[0];g++}for(;ha+1&&b.push(d.slice(a+1,g)),a=g):g===e-1&& +b.push(d.slice(a+1,g+1))});this.segments=b},setOptions:function(a){var b=this.chart,c=b.options.plotOptions,b=b.userOptions||{},d=b.plotOptions||{},e=c[this.type];this.userOptions=a;c=z(e,c.series,a);this.tooltipOptions=z(T.tooltip,T.plotOptions[this.type].tooltip,b.tooltip,d.series&&d.series.tooltip,d[this.type]&&d[this.type].tooltip,a.tooltip);e.marker===null&&delete c.marker;this.zoneAxis=c.zoneAxis;a=this.zones=(c.zones||[]).slice();if((c.negativeColor||c.negativeFillColor)&&!c.zones)a.push({value:c[this.zoneAxis+ +"Threshold"]||c.threshold||0,color:c.negativeColor,fillColor:c.negativeFillColor});a.length&&q(a[a.length-1].value)&&a.push({color:this.color,fillColor:this.fillColor});return c},getCyclic:function(a,b,c){var d=this.userOptions,e="_"+a+"Index",f=a+"Counter";b||(q(d[e])?b=d[e]:(d[e]=b=this.chart[f]%c.length,this.chart[f]+=1),b=c[b]);this[a]=b},getColor:function(){this.options.colorByPoint||this.getCyclic("color",this.options.color||ba[this.type].color,this.chart.options.colors)},getSymbol:function(){var a= +this.options.marker;this.getCyclic("symbol",a.symbol,this.chart.options.symbols);if(/^url/.test(this.symbol))a.radius=0},drawLegendSymbol:Na.drawLineMarker,setData:function(a,b,c,d){var e=this,f=e.points,g=f&&f.length||0,h,i=e.options,j=e.chart,k=null,l=e.xAxis,m=l&&!!l.categories,n=i.turboThreshold,v=this.xData,s=this.yData,q=(h=e.pointArrayMap)&&h.length,a=a||[];h=a.length;b=p(b,!0);if(d!==!1&&h&&g===h&&!e.cropped&&!e.hasGroupedData&&e.visible)o(a,function(a,b){f[b].update&&f[b].update(a,!1,null, +!1)});else{e.xIncrement=null;e.pointRange=m?1:i.pointRange;e.colorCounter=0;o(this.parallelArrays,function(a){e[a+"Data"].length=0});if(n&&h>n){for(c=0;k===null&&ci||this.forceCrop))if(b[d-1]m)b=[],c=[];else if(b[0]m)e=this.cropData(this.xData,this.yData,l,m),b=e.xData,c=e.yData,e=e.start,f=!0;for(i=b.length-1;i>=0;i--)d=b[i]-b[i-1],d>0&&(g===y||d=c){f=u(0,i-h);break}for(;id){g=i+h;break}return{xData:a.slice(f,g),yData:b.slice(f,g),start:f,end:g}},generatePoints:function(){var a=this.options.data,b=this.data,c,d=this.processedXData,e=this.processedYData,f=this.pointClass,g=d.length,h=this.cropStart||0,i,j=this.hasGroupedData,k,l=[],m;if(!b&&!j)b=[],b.length=a.length,b=this.data=b;for(m=0;m0),j=this.getExtremesFromAll||this.options.getExtremesFromAll||this.cropped|| +(c[l+1]||j)>=g&&(c[l-1]||j)<=h,i&&j)if(i=k.length)for(;i--;)k[i]!==null&&(e[f++]=k[i]);else e[f++]=k;this.dataMin=Pa(e);this.dataMax=Fa(e)},translate:function(){this.processedXData||this.processData();this.generatePoints();for(var a=this.options,b=a.stacking,c=this.xAxis,d=c.categories,e=this.yAxis,f=this.points,g=f.length,h=!!this.modifyValue,i=a.pointPlacement,j=i==="between"||ra(i),k=a.threshold,l=a.startFromThreshold?k:0,m,n,v,o=Number.MAX_VALUE,a=0;a=0&&n<=e.len&&m>=0&&m<=c.len;r.clientX=j?c.translate(x,0,0,0,1):m;r.negative=r.y<(k||0);r.category=d&&d[r.x]!==y?d[r.x]:r.x;a&&(o=C(o,O(m-v)));v=m}this.closestPointRangePx=o;this.getSegments()},setClip:function(a){var b=this.chart,c=b.renderer,d=b.inverted,e=this.clipBox,f=e||b.clipBox,g=this.sharedClipKey||["_sharedClip",a&&a.duration,a&&a.easing,f.height].join(","),h=b[g],i=b[g+"m"];if(!h){if(a)f.width= +0,b[g+"m"]=i=c.clipRect(-99,d?-b.plotLeft:-b.plotTop,99,d?b.chartWidth:b.chartHeight);b[g]=h=c.clipRect(f)}a&&(h.count+=1);if(this.options.clip!==!1)this.group.clip(a||e?h:b.clipRect),this.markerGroup.clip(i),this.sharedClipKey=g;a||(h.count-=1,h.count<=0&&g&&b[g]&&(e||(b[g]=b[g].destroy()),b[g+"m"]&&(b[g+"m"]=b[g+"m"].destroy())))},animate:function(a){var b=this.chart,c=this.options.animation,d;if(c&&!da(c))c=ba[this.type].animation;a?this.setClip(c):(d=this.sharedClipKey,(a=b[d])&&a.animate({width:b.plotSizeX}, +c),b[d+"m"]&&b[d+"m"].animate({width:b.plotSizeX+99},c),this.animate=null)},afterAnimate:function(){this.setClip();I(this,"afterAnimate")},drawPoints:function(){var a,b=this.points,c=this.chart,d,e,f,g,h,i,j,k,l=this.options.marker,m=this.pointAttr[""],n,v,o,r=this.markerGroup,q=p(l.enabled,this.xAxis.isRadial,this.closestPointRangePx>2*l.radius);if(l.enabled!==!1||this._hasPointMarkers)for(f=b.length;f--;)if(g=b[f],d=V(g.plotX),e=g.plotY,k=g.graphic,n=g.marker||{},v=!!g.marker,a=q&&n.enabled===y|| +n.enabled,o=g.isInside,a&&e!==y&&!isNaN(e)&&g.y!==null)if(a=g.pointAttr[g.selected?"select":""]||m,h=a.r,i=p(n.symbol,this.symbol),j=i.indexOf("url")===0,k)k[o?"show":"hide"](!0).animate(x({x:d-h,y:e-h},k.symbolName?{width:2*h,height:2*h}:{}));else{if(o&&(h>0||j))g.graphic=c.renderer.symbol(i,d-h,e-h,2*h,2*h,v?n:l).attr(a).add(r)}else if(k)g.graphic=k.destroy()},convertAttribs:function(a,b,c,d){var e=this.pointAttrToOptions,f,g,h={},a=a||{},b=b||{},c=c||{},d=d||{};for(f in e)g=e[f],h[f]=p(a[g],b[f], +c[f],d[f]);return h},getAttribs:function(){var a=this,b=a.options,c=ba[a.type].marker?b.marker:b,d=c.states,e=d.hover,f,g=a.color,h=a.options.negativeColor;f={stroke:g,fill:g};var i=a.points||[],j,k=[],l,m=a.pointAttrToOptions;l=a.hasPointSpecificOptions;var n=c.lineColor,p=c.fillColor;j=b.turboThreshold;var s=a.zones,r=a.zoneAxis||"y",u;b.marker?(e.radius=e.radius||c.radius+e.radiusPlus,e.lineWidth=e.lineWidth||c.lineWidth+e.lineWidthPlus):(e.color=e.color||oa(e.color||g).brighten(e.brightness).get(), +e.negativeColor=e.negativeColor||oa(e.negativeColor||h).brighten(e.brightness).get());k[""]=a.convertAttribs(c,f);o(["hover","select"],function(b){k[b]=a.convertAttribs(d[b],k[""])});a.pointAttr=k;g=i.length;if(!j||g=f.value;)f=s[++l];j.color=j.fillColor=f.color}l=b.colorByPoint||j.color;if(j.options)for(u in m)q(c[m[u]])&&(l=!0);if(l){c=c||{};l=[];d=c.states||{};f=d.hover= +d.hover||{};if(!b.marker)f.color=f.color||!j.options.color&&e[j.negative&&h?"negativeColor":"color"]||oa(j.color).brighten(f.brightness||e.brightness).get();f={color:j.color};if(!p)f.fillColor=j.color;if(!n)f.lineColor=j.color;c.hasOwnProperty("color")&&!c.color&&delete c.color;l[""]=a.convertAttribs(x(f,c),k[""]);l.hover=a.convertAttribs(d.hover,k.hover,l[""]);l.select=a.convertAttribs(d.select,k.select,l[""])}else l=k;j.pointAttr=l}},destroy:function(){var a=this,b=a.chart,c=/AppleWebKit\/533/.test(Ba), +d,e=a.data||[],f,g,h;I(a,"destroy");Z(a);o(a.axisTypes||[],function(b){if(h=a[b])ja(h.series,a),h.isDirty=h.forceRedraw=!0});a.legendItem&&a.chart.legend.destroyItem(a);for(d=e.length;d--;)(f=e[d])&&f.destroy&&f.destroy();a.points=null;clearTimeout(a.animationTimeout);for(g in a)a[g]instanceof Q&&!a[g].survive&&(d=c&&g==="group"?"hide":"destroy",a[g][d]());if(b.hoverSeries===a)b.hoverSeries=null;ja(b.series,a);for(g in a)delete a[g]},getSegmentPath:function(a){var b=this,c=[],d=b.options.step;o(a, +function(e,f){var g=e.plotX,h=e.plotY,i;b.getPointSpline?c.push.apply(c,b.getPointSpline(a,e,f)):(c.push(f?"L":"M"),d&&f&&(i=a[f-1],d==="right"?c.push(i.plotX,h):d==="center"?c.push((i.plotX+g)/2,i.plotY,(i.plotX+g)/2,h):c.push(g,i.plotY)),c.push(e.plotX,e.plotY))});return c},getGraphPath:function(){var a=this,b=[],c,d=[];o(a.segments,function(e){c=a.getSegmentPath(e);e.length>1?b=b.concat(c):d.push(e[0])});a.singlePoints=d;return a.graphPath=b},drawGraph:function(){var a=this,b=this.options,c=[["graph", +b.lineColor||this.color,b.dashStyle]],d=b.lineWidth,e=b.linecap!=="square",f=this.getGraphPath(),g=this.fillGraph&&this.color||P;o(this.zones,function(d,e){c.push(["zoneGraph"+e,d.color||a.color,d.dashStyle||b.dashStyle])});o(c,function(c,i){var j=c[0],k=a[j];if(k)db(k),k.animate({d:f});else if((d||g)&&f.length)k={stroke:c[1],"stroke-width":d,fill:g,zIndex:1},c[2]?k.dashstyle=c[2]:e&&(k["stroke-linecap"]=k["stroke-linejoin"]="round"),a[j]=a.chart.renderer.path(f).attr(k).add(a.group).shadow(i<2&& +b.shadow)})},applyZones:function(){var a=this,b=this.chart,c=b.renderer,d=this.zones,e,f,g=this.clips||[],h,i=this.graph,j=this.area,k=u(b.chartWidth,b.chartHeight),l=this[(this.zoneAxis||"y")+"Axis"],m,n=l.reversed,v=b.inverted,s=l.horiz,q,x,t,w=!1;if(d.length&&(i||j))i&&i.hide(),j&&j.hide(),m=l.getExtremes(),o(d,function(d,o){e=n?s?b.plotWidth:0:s?0:l.toPixels(m.min);e=C(u(p(f,e),0),k);f=C(u(r(l.toPixels(p(d.value,m.max),!0)),0),k);w&&(e=f=l.toPixels(m.max));q=Math.abs(e-f);x=C(e,f);t=u(e,f);if(l.isXAxis){if(h= +{x:v?t:x,y:0,width:q,height:k},!s)h.x=b.plotHeight-h.x}else if(h={x:0,y:v?t:x,width:k,height:q},s)h.y=b.plotWidth-h.y;b.inverted&&c.isVML&&(h=l.isXAxis?{x:0,y:n?x:t,height:h.width,width:b.chartWidth}:{x:h.y-b.plotLeft-b.spacingBox.x,y:0,width:h.height,height:b.chartHeight});g[o]?g[o].animate(h):(g[o]=c.clipRect(h),i&&a["zoneGraph"+o].clip(g[o]),j&&a["zoneArea"+o].clip(g[o]));w=d.value>m.max}),this.clips=g},invertGroups:function(){function a(){var a={width:b.yAxis.len,height:b.xAxis.len};o(["group", +"markerGroup"],function(c){b[c]&&b[c].attr(a).invert()})}var b=this,c=b.chart;if(b.xAxis)H(c,"resize",a),H(b,"destroy",function(){Z(c,"resize",a)}),a(),b.invertGroups=a},plotGroup:function(a,b,c,d,e){var f=this[a],g=!f;g&&(this[a]=f=this.chart.renderer.g(b).attr({visibility:c,zIndex:d||0.1}).add(e));f[g?"attr":"animate"](this.getPlotBox());return f},getPlotBox:function(){var a=this.chart,b=this.xAxis,c=this.yAxis;if(a.inverted)b=c,c=this.xAxis;return{translateX:b?b.left:a.plotLeft,translateY:c?c.top: +a.plotTop,scaleX:1,scaleY:1}},render:function(){var a=this,b=a.chart,c,d=a.options,e=(c=d.animation)&&!!a.animate&&b.renderer.isSVG&&p(c.duration,500)||0,f=a.visible?"visible":"hidden",g=d.zIndex,h=a.hasRendered,i=b.seriesGroup;c=a.plotGroup("group","series",f,g,i);a.markerGroup=a.plotGroup("markerGroup","markers",f,g,i);e&&a.animate(!0);a.getAttribs();c.inverted=a.isCartesian?b.inverted:!1;a.drawGraph&&(a.drawGraph(),a.applyZones());o(a.points,function(a){a.redraw&&a.redraw()});a.drawDataLabels&& +a.drawDataLabels();a.visible&&a.drawPoints();a.drawTracker&&a.options.enableMouseTracking!==!1&&a.drawTracker();b.inverted&&a.invertGroups();d.clip!==!1&&!a.sharedClipKey&&!h&&c.clip(b.clipRect);e&&a.animate();if(!h)e?a.animationTimeout=setTimeout(function(){a.afterAnimate()},e):a.afterAnimate();a.isDirty=a.isDirtyData=!1;a.hasRendered=!0},redraw:function(){var a=this.chart,b=this.isDirtyData,c=this.isDirty,d=this.group,e=this.xAxis,f=this.yAxis;d&&(a.inverted&&d.attr({width:a.plotWidth,height:a.plotHeight}), +d.animate({translateX:p(e&&e.left,a.plotLeft),translateY:p(f&&f.top,a.plotTop)}));this.translate();this.render();b&&I(this,"updatedData");(c||b)&&delete this.kdTree},kdDimensions:1,kdAxisArray:["clientX","plotY"],searchPoint:function(a,b){var c=this.xAxis,d=this.yAxis,e=this.chart.inverted;return this.searchKDTree({clientX:e?c.len-a.chartY+c.pos:a.chartX-c.pos,plotY:e?d.len-a.chartX+d.pos:a.chartY-d.pos},b)},buildKDTree:function(){function a(b,d,g){var h,i;if(i=b&&b.length)return h=c.kdAxisArray[d% +g],b.sort(function(a,b){return a[h]-b[h]}),i=Math.floor(i/2),{point:b[i],left:a(b.slice(0,i),d+1,g),right:a(b.slice(i+1),d+1,g)}}function b(){var b=lb(c.points,function(a){return a.y!==null});c.kdTree=a(b,d,d)}var c=this,d=c.kdDimensions;delete c.kdTree;c.options.kdSync?b():setTimeout(b)},searchKDTree:function(a,b){function c(a,b,j,k){var l=b.point,m=d.kdAxisArray[j%k],n,p,o=l;p=q(a[e])&&q(l[e])?Math.pow(a[e]-l[e],2):null;n=q(a[f])&&q(l[f])?Math.pow(a[f]-l[f],2):null;n=(p||0)+(n||0);l.dist=q(n)?Math.sqrt(n): +Number.MAX_VALUE;l.distX=q(p)?Math.sqrt(p):Number.MAX_VALUE;m=a[m]-l[m];n=m<0?"left":"right";p=m<0?"right":"left";b[n]&&(n=c(a,b[n],j+1,k),o=n[g]m;)d--;e.updateParallelArrays(i,"splice",d,0,0);e.updateParallelArrays(i,d);if(k&&i.name)k[m]=i.name;h.splice(d,0,a);n&&(e.data.splice(d,0,null),e.processData());f.legendType==="point"&&e.generatePoints();c&&(g[0]&&g[0].remove?g[0].remove(!1):(g.shift(),e.updateParallelArrays(i,"shift"),h.shift()));e.isDirty=!0;e.isDirtyData=!0;b&&(e.getAttribs(), +j.redraw())},removePoint:function(a,b,c){var d=this,e=d.data,f=e[a],g=d.points,h=d.chart,i=function(){e.length===g.length&&g.splice(a,1);e.splice(a,1);d.options.data.splice(a,1);d.updateParallelArrays(f||{series:d},"splice",a,1);f&&f.destroy();d.isDirty=!0;d.isDirtyData=!0;b&&h.redraw()};Sa(c,h);b=p(b,!0);f?f.firePointEvent("remove",null,i):i()},remove:function(a,b){var c=this,d=c.chart,a=p(a,!0);if(!c.isRemoving)c.isRemoving=!0,I(c,"remove",null,function(){c.destroy();d.isDirtyLegend=d.isDirtyBox= +!0;d.linkSeries();a&&d.redraw(b)});c.isRemoving=!1},update:function(a,b){var c=this,d=this.chart,e=this.userOptions,f=this.type,g=M[f].prototype,h=["group","markerGroup","dataLabelsGroup"],i;if(a.type&&a.type!==f||a.zIndex!==void 0)h.length=0;o(h,function(a){h[a]=c[a];delete c[a]});a=z(e,{animation:!1,index:this.index,pointStart:this.xData[0]},{data:this.options.data},a);this.remove(!1);for(i in g)this[i]=y;x(this,M[a.type||f].prototype);o(h,function(a){c[a]=h[a]});this.init(d,a);d.linkSeries();p(b, +!0)&&d.redraw(!1)}});x(va.prototype,{update:function(a,b){var c=this.chart,a=c.options[this.coll][this.options.index]=z(this.userOptions,a);this.destroy(!0);this._addedPlotLB=this.chart._labelPanes=y;this.init(c,x(a,{events:y}));c.isDirtyBox=!0;p(b,!0)&&c.redraw()},remove:function(a){for(var b=this.chart,c=this.coll,d=this.series,e=d.length;e--;)d[e]&&d[e].remove(!1);ja(b.axes,this);ja(b[c],this);b.options[c].splice(this.options.index,1);o(b[c],function(a,b){a.options.index=b});this.destroy();b.isDirtyBox= +!0;p(a,!0)&&b.redraw()},setTitle:function(a,b){this.update({title:a},b)},setCategories:function(a,b){this.update({categories:a},b)}});var xa=ka(R);M.line=xa;ba.area=z(U,{threshold:0});var qa=ka(R,{type:"area",getSegments:function(){var a=this,b=[],c=[],d=[],e=this.xAxis,f=this.yAxis,g=f.stacks[this.stackKey],h={},i,j,k=this.points,l=this.options.connectNulls,m,n;if(this.options.stacking&&!this.cropped){for(m=0;m=0;d--)g=p(a[d].yBottom,f),da&&i>e?(i=u(a,e),k=2*e-i):ig&&k>e?(k=u(g,e),i=2*e-k):kg?d-g:f-(x?g:0))); +c.barX=o;c.pointWidth=i;q=r(o+q)+l;o=r(o)+l;q-=o;d=O(t)<0.5;w=C(r(t+w)+m,9E4);t=r(t)+m;w-=t;d&&(t-=1,w+=1);c.tooltipPos=b.inverted?[e.len+e.pos-b.plotLeft-h,a.xAxis.len-o-q/2,w]:[o+q/2,h+e.pos-b.plotTop,w];c.shapeType="rect";c.shapeArgs={x:o,y:t,width:q,height:w}})},getSymbol:na,drawLegendSymbol:Na.drawRectangle,drawGraph:na,drawPoints:function(){var a=this,b=this.chart,c=a.options,d=b.renderer,e=c.animationLimit||250,f,g;o(a.points,function(h){var i=h.plotY,j=h.graphic;if(i!==y&&!isNaN(i)&&h.y!== +null)f=h.shapeArgs,i=q(a.borderWidth)?{"stroke-width":a.borderWidth}:{},g=h.pointAttr[h.selected?"select":""]||a.pointAttr[""],j?(db(j),j.attr(i)[b.pointCount\u25CF {series.name}
', +pointFormat:"x: {point.x}
y: {point.y}
"}});qa=ka(R,{type:"scatter",sorted:!1,requireSorting:!1,noSharedTooltip:!0,trackerGroups:["group","markerGroup","dataLabelsGroup"],takeOrdinalPosition:!1,kdDimensions:2,drawGraph:function(){this.options.lineWidth&&R.prototype.drawGraph.call(this)}});M.scatter=qa;ba.pie=z(U,{borderColor:"#FFFFFF",borderWidth:1,center:[null,null],clip:!1,colorByPoint:!0,dataLabels:{distance:30,enabled:!0,formatter:function(){return this.point.name},x:0}, +ignoreHiddenPoint:!0,legendType:"point",marker:null,size:null,showInLegend:!1,slicedOffset:10,states:{hover:{brightness:0.1,shadow:!1}},stickyTracking:!1,tooltip:{followPointer:!0}});U={type:"pie",isCartesian:!1,pointClass:ka(Ga,{init:function(){Ga.prototype.init.apply(this,arguments);var a=this,b;x(a,{visible:a.visible!==!1,name:p(a.name,"Slice")});b=function(b){a.slice(b.type==="select")};H(a,"select",b);H(a,"unselect",b);return a},setVisible:function(a,b){var c=this,d=c.series,e=d.chart,f=d.options.ignoreHiddenPoint, +b=p(b,f);if(a!==c.visible){c.visible=c.options.visible=a=a===y?!c.visible:a;d.options.data[Ma(c,d.data)]=c.options;o(["graphic","dataLabel","connector","shadowGroup"],function(b){if(c[b])c[b][a?"show":"hide"](!0)});c.legendItem&&e.legend.colorizeItem(c,a);!a&&c.state==="hover"&&c.setState("");if(f)d.isDirty=!0;b&&e.redraw()}},slice:function(a,b,c){var d=this.series;Sa(c,d.chart);p(b,!0);this.sliced=this.options.sliced=a=q(a)?a:!this.sliced;d.options.data[Ma(this,d.data)]=this.options;a=a?this.slicedTranslation: +{translateX:0,translateY:0};this.graphic.animate(a);this.shadowGroup&&this.shadowGroup.animate(a)},haloPath:function(a){var b=this.shapeArgs,c=this.series.chart;return this.sliced||!this.visible?[]:this.series.chart.renderer.symbols.arc(c.plotLeft+b.x,c.plotTop+b.y,b.r+a,b.r+a,{innerR:this.shapeArgs.r,start:b.start,end:b.end})}}),requireSorting:!1,directTouch:!0,noSharedTooltip:!0,trackerGroups:["group","dataLabelsGroup"],axisTypes:[],pointAttrToOptions:{stroke:"borderColor","stroke-width":"borderWidth", +fill:"color"},getColor:na,animate:function(a){var b=this,c=b.points,d=b.startAngleRad;if(!a)o(c,function(a){var c=a.graphic,g=a.shapeArgs;c&&(c.attr({r:a.startR||b.center[3]/2,start:d,end:d}),c.animate({r:g.r,start:g.start,end:g.end},b.options.animation))}),b.animate=null},setData:function(a,b,c,d){R.prototype.setData.call(this,a,!1,c,d);this.processData();this.generatePoints();p(b,!0)&&this.chart.redraw(c)},updateTotals:function(){var a,b=0,c=this.points,d=c.length,e,f=this.options.ignoreHiddenPoint; +for(a=0;a0&&(e.visible||!f)?e.y/b*100:0,e.total=b},generatePoints:function(){R.prototype.generatePoints.call(this);this.updateTotals()},translate:function(a){this.generatePoints();var b=0,c=this.options,d=c.slicedOffset,e=d+c.borderWidth,f,g,h,i=c.startAngle||0,j=this.startAngleRad=ma/180*(i-90),i=(this.endAngleRad=ma/180*(p(c.endAngle,i+360)-90))-j,k=this.points,l=c.dataLabels.distance,c=c.ignoreHiddenPoint,m, +n=k.length,o;if(!a)this.center=a=this.getCenter();this.getX=function(b,c){h=W.asin(C((b-a[1])/(a[2]/2+l),1));return a[0]+(c?-1:1)*X(h)*(a[2]/2+l)};for(m=0;m1.5*ma?h-=2*ma:h<-ma/2&&(h+=2*ma);o.slicedTranslation={translateX:r(X(h)*d),translateY:r(aa(h)*d)};f=X(h)*a[2]/2;g=aa(h)*a[2]/2;o.tooltipPos=[a[0]+f*0.7,a[1]+g* +0.7];o.half=h<-ma/2||h>ma/2?1:0;o.angle=h;e=C(e,l/2);o.labelPos=[a[0]+f+X(h)*l,a[1]+g+aa(h)*l,a[0]+f+X(h)*e,a[1]+g+aa(h)*e,a[0]+f,a[1]+g,l<0?"center":o.half?"right":"left",h]}},drawGraph:null,drawPoints:function(){var a=this,b=a.chart.renderer,c,d,e=a.options.shadow,f,g,h;if(e&&!a.shadowGroup)a.shadowGroup=b.g("shadow").add(a.group);o(a.points,function(i){d=i.graphic;g=i.shapeArgs;f=i.shadowGroup;if(e&&!f)f=i.shadowGroup=b.g("shadow").add(a.shadowGroup);c=i.sliced?i.slicedTranslation:{translateX:0, +translateY:0};f&&f.attr(c);if(d)d.animate(x(g,c));else{h={"stroke-linejoin":"round"};if(!i.visible)h.visibility="hidden";i.graphic=d=b[i.shapeType](g).setRadialReference(a.center).attr(i.pointAttr[i.selected?"select":""]).attr(h).attr(c).add(a.group).shadow(e,f)}})},searchPoint:na,sortByAngle:function(a,b){a.sort(function(a,d){return a.angle!==void 0&&(d.angle-a.angle)*b})},drawLegendSymbol:Na.drawRectangle,getCenter:Yb.getCenter,getSymbol:na};U=ka(R,U);M.pie=U;R.prototype.drawDataLabels=function(){var a= +this,b=a.options,c=b.cursor,d=b.dataLabels,e=a.points,f,g,h=a.hasRendered||0,i,j,k=a.chart.renderer;if(d.enabled||a._hasPointLabels)a.dlProcessOptions&&a.dlProcessOptions(d),j=a.plotGroup("dataLabelsGroup","data-labels",d.defer?"hidden":"visible",d.zIndex||6),p(d.defer,!0)&&(j.attr({opacity:+h}),h||H(a,"afterAnimate",function(){a.visible&&j.show();j[b.animation?"animate":"attr"]({opacity:1},{duration:200})})),g=d,o(e,function(e){var h,n=e.dataLabel,o,s,r=e.connector,u=!0,t,w={};f=e.dlOptions||e.options&& +e.options.dataLabels;h=p(f&&f.enabled,g.enabled);if(n&&!h)e.dataLabel=n.destroy();else if(h){d=z(g,f);t=d.style;h=d.rotation;o=e.getLabelConfig();i=d.format?Ja(d.format,o):d.formatter.call(o,d);t.color=p(d.color,t.color,a.color,"black");if(n)if(q(i))n.attr({text:i}),u=!1;else{if(e.dataLabel=n=n.destroy(),r)e.connector=r.destroy()}else if(q(i)){n={fill:d.backgroundColor,stroke:d.borderColor,"stroke-width":d.borderWidth,r:d.borderRadius||0,rotation:h,padding:d.padding,zIndex:1};if(t.color==="contrast")w.color= +d.inside||d.distance<0||b.stacking?k.getContrast(e.color||a.color):"#000000";if(c)w.cursor=c;for(s in n)n[s]===y&&delete n[s];n=e.dataLabel=k[h?"text":"label"](i,0,-999,d.shape,null,null,d.useHTML).attr(n).css(x(t,w)).add(j).shadow(d.shadow)}n&&a.alignDataLabel(e,n,d,null,u)}})};R.prototype.alignDataLabel=function(a,b,c,d,e){var f=this.chart,g=f.inverted,h=p(a.plotX,-999),i=p(a.plotY,-999),j=b.getBBox(),k=f.renderer.fontMetrics(c.style.fontSize).b,l=this.visible&&(a.series.forceDL||f.isInsidePlot(h, +r(i),g)||d&&f.isInsidePlot(h,g?d.x+1:d.y+d.height-1,g));if(l)d=x({x:g?f.plotWidth-i:h,y:r(g?f.plotHeight-h:i),width:0,height:0},d),x(c,{width:j.width,height:j.height}),c.rotation?(a=f.renderer.rotCorr(k,c.rotation),b[e?"attr":"animate"]({x:d.x+c.x+d.width/2+a.x,y:d.y+c.y+d.height/2}).attr({align:c.align})):(b.align(c,null,d),g=b.alignAttr,p(c.overflow,"justify")==="justify"?this.justifyDataLabel(b,c,g,j,d,e):p(c.crop,!0)&&(l=f.isInsidePlot(g.x,g.y)&&f.isInsidePlot(g.x+j.width,g.y+j.height)),c.shape&& +b.attr({anchorX:a.plotX,anchorY:a.plotY}));if(!l)b.attr({y:-999}),b.placed=!1};R.prototype.justifyDataLabel=function(a,b,c,d,e,f){var g=this.chart,h=b.align,i=b.verticalAlign,j,k,l=a.box?0:a.padding||0;j=c.x+l;if(j<0)h==="right"?b.align="left":b.x=-j,k=!0;j=c.x+d.width-l;if(j>g.plotWidth)h==="left"?b.align="right":b.x=g.plotWidth-j,k=!0;j=c.y+l;if(j<0)i==="bottom"?b.verticalAlign="top":b.y=-j,k=!0;j=c.y+d.height-l;if(j>g.plotHeight)i==="top"?b.verticalAlign="bottom":b.y=g.plotHeight-j,k=!0;if(k)a.placed= +!f,a.align(b,null,e)};if(M.pie)M.pie.prototype.drawDataLabels=function(){var a=this,b=a.data,c,d=a.chart,e=a.options.dataLabels,f=p(e.connectorPadding,10),g=p(e.connectorWidth,1),h=d.plotWidth,i=d.plotHeight,j,k,l=p(e.softConnector,!0),m=e.distance,n=a.center,q=n[2]/2,s=n[1],x=m>0,y,t,w,z=[[],[]],B,A,D,F,G,E=[0,0,0,0],L=function(a,b){return b.y-a.y};if(a.visible&&(e.enabled||a._hasPointLabels)){R.prototype.drawDataLabels.apply(a);o(b,function(a){a.dataLabel&&a.visible&&z[a.half].push(a)});for(F=2;F--;){var I= +[],M=[],H=z[F],K=H.length,J;if(K){a.sortByAngle(H,F-0.5);for(G=b=0;!b&&H[G];)b=H[G]&&H[G].dataLabel&&(H[G].dataLabel.getBBox().height||21),G++;if(m>0){t=C(s+q+m,d.plotHeight);for(G=u(0,s-q-m);G<=t;G+=b)I.push(G);t=I.length;if(K>t){c=[].concat(H);c.sort(L);for(G=K;G--;)c[G].rank=G;for(G=K;G--;)H[G].rank>=t&&H.splice(G,1);K=H.length}for(G=0;G0){if(t=M.pop(),J=t.i,A=t.y,c>A&&I[J+1]!==null||ch- +f&&(E[1]=u(r(B+t-h+f),E[1])),A-b/2<0?E[0]=u(r(-A+b/2),E[0]):A+b/2>i&&(E[2]=u(r(A+b/2-i),E[2]))}}}if(Fa(E)===0||this.verifyDataLabelOverflow(E))this.placeDataLabels(),x&&g&&o(this.points,function(b){j=b.connector;w=b.labelPos;if((y=b.dataLabel)&&y._pos&&b.visible)D=y._attr.visibility,B=y.connX,A=y.connY,k=l?["M",B+(w[6]==="left"?5:-5),A,"C",B,A,2*w[2]-w[4],2*w[3]-w[5],w[2],w[3],"L",w[4],w[5]]:["M",B+(w[6]==="left"?5:-5),A,"L",w[2],w[3],"L",w[4],w[5]],j?(j.animate({d:k}),j.attr("visibility",D)):b.connector= +j=a.chart.renderer.path(k).attr({"stroke-width":g,stroke:e.connectorColor||b.color||"#606060",visibility:D}).add(a.dataLabelsGroup);else if(j)b.connector=j.destroy()})}},M.pie.prototype.placeDataLabels=function(){o(this.points,function(a){var b=a.dataLabel;if(b&&a.visible)(a=b._pos)?(b.attr(b._attr),b[b.moved?"animate":"attr"](a),b.moved=!0):b&&b.attr({y:-999})})},M.pie.prototype.alignDataLabel=na,M.pie.prototype.verifyDataLabelOverflow=function(a){var b=this.center,c=this.options,d=c.center,e=c.minSize|| +80,f=e,g;d[0]!==null?f=u(b[2]-u(a[1],a[3]),e):(f=u(b[2]-a[1]-a[3],e),b[0]+=(a[3]-a[1])/2);d[1]!==null?f=u(C(f,b[2]-u(a[0],a[2])),e):(f=u(C(f,b[2]-a[0]-a[2]),e),b[1]+=(a[0]-a[2])/2);fp(this.translatedThreshold,g.yAxis.len)),j=p(c.inside,!!this.options.stacking);if(h&&(d=z(h),f&&(d={x:g.yAxis.len-d.y-d.height,y:g.xAxis.len-d.x-d.width,width:d.height,height:d.width}),!j))f?(d.x+=i?0:d.width,d.width=0):(d.y+=i?d.height:0,d.height=0);c.align=p(c.align,!f||j?"center":i?"right":"left");c.verticalAlign=p(c.verticalAlign,f||j?"middle":i?"top":"bottom");R.prototype.alignDataLabel.call(this,a,b,c,d,e)};(function(a){var b= +a.Chart,c=a.each,d=a.pick,e=HighchartsAdapter.addEvent;b.prototype.callbacks.push(function(a){function b(){var e=[];c(a.series,function(a){var b=a.options.dataLabels;(b.enabled||a._hasPointLabels)&&!b.allowOverlap&&a.visible&&c(a.points,function(a){if(a.dataLabel)a.dataLabel.labelrank=d(a.labelrank,a.shapeArgs&&a.shapeArgs.height),e.push(a.dataLabel)})});a.hideOverlappingLabels(e)}b();e(a,"redraw",b)});b.prototype.hideOverlappingLabels=function(a){var b=a.length,c,d,e,k;for(d=0;de.alignAttr.x+e.width||k.alignAttr.x+k.widthe.alignAttr.y+e.height||k.alignAttr.y+k.heightd;if(h.series.length&&(i||l>C(k.dataMin,k.min))&&(!i||ja?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(e=arguments[h]))for(d in e)a=g[d],c=e[d],g!==c&&(j&&c&&(n.isPlainObject(c)||(b=n.isArray(c)))?(b?(b=!1,f=a&&n.isArray(a)?a:[]):f=a&&n.isPlainObject(a)?a:{},g[d]=n.extend(j,f,c)):void 0!==c&&(g[d]=c));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray||function(a){return"array"===n.type(a)},isWindow:function(a){return null!=a&&a==a.window},isNumeric:function(a){return a-parseFloat(a)>=0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},isPlainObject:function(a){var b;if(!a||"object"!==n.type(a)||a.nodeType||n.isWindow(a))return!1;try{if(a.constructor&&!j.call(a,"constructor")&&!j.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}if(l.ownLast)for(b in a)return j.call(a,b);for(b in a);return void 0===b||j.call(a,b)},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(b){b&&n.trim(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:k&&!k.call("\ufeff\xa0")?function(a){return null==a?"":k.call(a)}:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){var d;if(b){if(g)return g.call(b,a,c);for(d=b.length,c=c?0>c?Math.max(0,d+c):c:0;d>c;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,b){var c=+b.length,d=0,e=a.length;while(c>d)a[e++]=b[d++];if(c!==c)while(void 0!==b[d])a[e++]=b[d++];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(f=a[b],b=a,a=f),n.isFunction(a)?(c=d.call(arguments,2),e=function(){return a.apply(b||this,c.concat(d.call(arguments)))},e.guid=a.guid=a.guid||n.guid++,e):void 0},now:function(){return+new Date},support:l}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s="sizzle"+-new Date,t=a.document,u=0,v=0,w=eb(),x=eb(),y=eb(),z=function(a,b){return a===b&&(j=!0),0},A="undefined",B=1<<31,C={}.hasOwnProperty,D=[],E=D.pop,F=D.push,G=D.push,H=D.slice,I=D.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},J="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",K="[\\x20\\t\\r\\n\\f]",L="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",M=L.replace("w","w#"),N="\\["+K+"*("+L+")"+K+"*(?:([*^$|!~]?=)"+K+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+M+")|)|)"+K+"*\\]",O=":("+L+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+N.replace(3,8)+")*)|.*)\\)|)",P=new RegExp("^"+K+"+|((?:^|[^\\\\])(?:\\\\.)*)"+K+"+$","g"),Q=new RegExp("^"+K+"*,"+K+"*"),R=new RegExp("^"+K+"*([>+~]|"+K+")"+K+"*"),S=new RegExp("="+K+"*([^\\]'\"]*?)"+K+"*\\]","g"),T=new RegExp(O),U=new RegExp("^"+M+"$"),V={ID:new RegExp("^#("+L+")"),CLASS:new RegExp("^\\.("+L+")"),TAG:new RegExp("^("+L.replace("w","w*")+")"),ATTR:new RegExp("^"+N),PSEUDO:new RegExp("^"+O),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+K+"*(even|odd|(([+-]|)(\\d*)n|)"+K+"*(?:([+-]|)"+K+"*(\\d+)|))"+K+"*\\)|)","i"),bool:new RegExp("^(?:"+J+")$","i"),needsContext:new RegExp("^"+K+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+K+"*((?:-\\d)?\\d*)"+K+"*\\)|)(?=[^-]|$)","i")},W=/^(?:input|select|textarea|button)$/i,X=/^h\d$/i,Y=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,$=/[+~]/,_=/'|\\/g,ab=new RegExp("\\\\([\\da-f]{1,6}"+K+"?|("+K+")|.)","ig"),bb=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{G.apply(D=H.call(t.childNodes),t.childNodes),D[t.childNodes.length].nodeType}catch(cb){G={apply:D.length?function(a,b){F.apply(a,H.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function db(a,b,d,e){var f,g,h,i,j,m,p,q,u,v;if((b?b.ownerDocument||b:t)!==l&&k(b),b=b||l,d=d||[],!a||"string"!=typeof a)return d;if(1!==(i=b.nodeType)&&9!==i)return[];if(n&&!e){if(f=Z.exec(a))if(h=f[1]){if(9===i){if(g=b.getElementById(h),!g||!g.parentNode)return d;if(g.id===h)return d.push(g),d}else if(b.ownerDocument&&(g=b.ownerDocument.getElementById(h))&&r(b,g)&&g.id===h)return d.push(g),d}else{if(f[2])return G.apply(d,b.getElementsByTagName(a)),d;if((h=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return G.apply(d,b.getElementsByClassName(h)),d}if(c.qsa&&(!o||!o.test(a))){if(q=p=s,u=b,v=9===i&&a,1===i&&"object"!==b.nodeName.toLowerCase()){m=ob(a),(p=b.getAttribute("id"))?q=p.replace(_,"\\$&"):b.setAttribute("id",q),q="[id='"+q+"'] ",j=m.length;while(j--)m[j]=q+pb(m[j]);u=$.test(a)&&mb(b.parentNode)||b,v=m.join(",")}if(v)try{return G.apply(d,u.querySelectorAll(v)),d}catch(w){}finally{p||b.removeAttribute("id")}}}return xb(a.replace(P,"$1"),b,d,e)}function eb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function fb(a){return a[s]=!0,a}function gb(a){var b=l.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function hb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function ib(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||B)-(~a.sourceIndex||B);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function jb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function kb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function lb(a){return fb(function(b){return b=+b,fb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function mb(a){return a&&typeof a.getElementsByTagName!==A&&a}c=db.support={},f=db.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},k=db.setDocument=function(a){var b,e=a?a.ownerDocument||a:t,g=e.defaultView;return e!==l&&9===e.nodeType&&e.documentElement?(l=e,m=e.documentElement,n=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){k()},!1):g.attachEvent&&g.attachEvent("onunload",function(){k()})),c.attributes=gb(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=gb(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=Y.test(e.getElementsByClassName)&&gb(function(a){return a.innerHTML="
",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=gb(function(a){return m.appendChild(a).id=s,!e.getElementsByName||!e.getElementsByName(s).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==A&&n){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(ab,bb);return function(a){var c=typeof a.getAttributeNode!==A&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==A?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==A&&n?b.getElementsByClassName(a):void 0},p=[],o=[],(c.qsa=Y.test(e.querySelectorAll))&&(gb(function(a){a.innerHTML="",a.querySelectorAll("[t^='']").length&&o.push("[*^$]="+K+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||o.push("\\["+K+"*(?:value|"+J+")"),a.querySelectorAll(":checked").length||o.push(":checked")}),gb(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&o.push("name"+K+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||o.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),o.push(",.*:")})),(c.matchesSelector=Y.test(q=m.webkitMatchesSelector||m.mozMatchesSelector||m.oMatchesSelector||m.msMatchesSelector))&&gb(function(a){c.disconnectedMatch=q.call(a,"div"),q.call(a,"[s!='']:x"),p.push("!=",O)}),o=o.length&&new RegExp(o.join("|")),p=p.length&&new RegExp(p.join("|")),b=Y.test(m.compareDocumentPosition),r=b||Y.test(m.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},z=b?function(a,b){if(a===b)return j=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===t&&r(t,a)?-1:b===e||b.ownerDocument===t&&r(t,b)?1:i?I.call(i,a)-I.call(i,b):0:4&d?-1:1)}:function(a,b){if(a===b)return j=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],k=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:i?I.call(i,a)-I.call(i,b):0;if(f===g)return ib(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)k.unshift(c);while(h[d]===k[d])d++;return d?ib(h[d],k[d]):h[d]===t?-1:k[d]===t?1:0},e):l},db.matches=function(a,b){return db(a,null,null,b)},db.matchesSelector=function(a,b){if((a.ownerDocument||a)!==l&&k(a),b=b.replace(S,"='$1']"),!(!c.matchesSelector||!n||p&&p.test(b)||o&&o.test(b)))try{var d=q.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return db(b,l,null,[a]).length>0},db.contains=function(a,b){return(a.ownerDocument||a)!==l&&k(a),r(a,b)},db.attr=function(a,b){(a.ownerDocument||a)!==l&&k(a);var e=d.attrHandle[b.toLowerCase()],f=e&&C.call(d.attrHandle,b.toLowerCase())?e(a,b,!n):void 0;return void 0!==f?f:c.attributes||!n?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},db.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},db.uniqueSort=function(a){var b,d=[],e=0,f=0;if(j=!c.detectDuplicates,i=!c.sortStable&&a.slice(0),a.sort(z),j){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return i=null,a},e=db.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=db.selectors={cacheLength:50,createPseudo:fb,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(ab,bb),a[3]=(a[4]||a[5]||"").replace(ab,bb),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||db.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&db.error(a[0]),a},PSEUDO:function(a){var b,c=!a[5]&&a[2];return V.CHILD.test(a[0])?null:(a[3]&&void 0!==a[4]?a[2]=a[4]:c&&T.test(c)&&(b=ob(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(ab,bb).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=w[a+" "];return b||(b=new RegExp("(^|"+K+")"+a+"("+K+"|$)"))&&w(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==A&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=db.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),t=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&t){k=q[s]||(q[s]={}),j=k[a]||[],n=j[0]===u&&j[1],m=j[0]===u&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[u,n,m];break}}else if(t&&(j=(b[s]||(b[s]={}))[a])&&j[0]===u)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(t&&((l[s]||(l[s]={}))[a]=[u,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||db.error("unsupported pseudo: "+a);return e[s]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?fb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=I.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:fb(function(a){var b=[],c=[],d=g(a.replace(P,"$1"));return d[s]?fb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:fb(function(a){return function(b){return db(a,b).length>0}}),contains:fb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:fb(function(a){return U.test(a||"")||db.error("unsupported lang: "+a),a=a.replace(ab,bb).toLowerCase(),function(b){var c;do if(c=n?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===m},focus:function(a){return a===l.activeElement&&(!l.hasFocus||l.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return X.test(a.nodeName)},input:function(a){return W.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:lb(function(){return[0]}),last:lb(function(a,b){return[b-1]}),eq:lb(function(a,b,c){return[0>c?c+b:c]}),even:lb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:lb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:lb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:lb(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function qb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=v++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[u,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[s]||(b[s]={}),(h=i[d])&&h[0]===u&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function rb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function sb(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function tb(a,b,c,d,e,f){return d&&!d[s]&&(d=tb(d)),e&&!e[s]&&(e=tb(e,f)),fb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||wb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:sb(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=sb(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?I.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=sb(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):G.apply(g,r)})}function ub(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],i=g||d.relative[" "],j=g?1:0,k=qb(function(a){return a===b},i,!0),l=qb(function(a){return I.call(b,a)>-1},i,!0),m=[function(a,c,d){return!g&&(d||c!==h)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>j;j++)if(c=d.relative[a[j].type])m=[qb(rb(m),c)];else{if(c=d.filter[a[j].type].apply(null,a[j].matches),c[s]){for(e=++j;f>e;e++)if(d.relative[a[e].type])break;return tb(j>1&&rb(m),j>1&&pb(a.slice(0,j-1).concat({value:" "===a[j-2].type?"*":""})).replace(P,"$1"),c,e>j&&ub(a.slice(j,e)),f>e&&ub(a=a.slice(e)),f>e&&pb(a))}m.push(c)}return rb(m)}function vb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,i,j,k){var m,n,o,p=0,q="0",r=f&&[],s=[],t=h,v=f||e&&d.find.TAG("*",k),w=u+=null==t?1:Math.random()||.1,x=v.length;for(k&&(h=g!==l&&g);q!==x&&null!=(m=v[q]);q++){if(e&&m){n=0;while(o=a[n++])if(o(m,g,i)){j.push(m);break}k&&(u=w)}c&&((m=!o&&m)&&p--,f&&r.push(m))}if(p+=q,c&&q!==p){n=0;while(o=b[n++])o(r,s,g,i);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=E.call(j));s=sb(s)}G.apply(j,s),k&&!f&&s.length>0&&p+b.length>1&&db.uniqueSort(j)}return k&&(u=w,h=t),r};return c?fb(f):f}g=db.compile=function(a,b){var c,d=[],e=[],f=y[a+" "];if(!f){b||(b=ob(a)),c=b.length;while(c--)f=ub(b[c]),f[s]?d.push(f):e.push(f);f=y(a,vb(e,d))}return f};function wb(a,b,c){for(var d=0,e=b.length;e>d;d++)db(a,b[d],c);return c}function xb(a,b,e,f){var h,i,j,k,l,m=ob(a);if(!f&&1===m.length){if(i=m[0]=m[0].slice(0),i.length>2&&"ID"===(j=i[0]).type&&c.getById&&9===b.nodeType&&n&&d.relative[i[1].type]){if(b=(d.find.ID(j.matches[0].replace(ab,bb),b)||[])[0],!b)return e;a=a.slice(i.shift().value.length)}h=V.needsContext.test(a)?0:i.length;while(h--){if(j=i[h],d.relative[k=j.type])break;if((l=d.find[k])&&(f=l(j.matches[0].replace(ab,bb),$.test(i[0].type)&&mb(b.parentNode)||b))){if(i.splice(h,1),a=f.length&&pb(i),!a)return G.apply(e,f),e;break}}}return g(a,m)(f,b,!n,e,$.test(a)&&mb(b.parentNode)||b),e}return c.sortStable=s.split("").sort(z).join("")===s,c.detectDuplicates=!!j,k(),c.sortDetached=gb(function(a){return 1&a.compareDocumentPosition(l.createElement("div"))}),gb(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||hb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&gb(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||hb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),gb(function(a){return null==a.getAttribute("disabled")})||hb(J,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),db}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return n.inArray(a,b)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=[],d=this,e=d.length;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;e>b;b++)if(n.contains(d[b],this))return!0}));for(b=0;e>b;b++)n.find(a,d[b],c);return c=this.pushStack(e>1?n.unique(c):c),c.selector=this.selector?this.selector+" "+a:a,c},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=a.document,A=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,B=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a.charAt(0)&&">"===a.charAt(a.length-1)&&a.length>=3?[null,a,null]:A.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:z,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}if(d=z.getElementById(c[2]),d&&d.parentNode){if(d.id!==c[2])return y.find(a);this.length=1,this[0]=d}return this.context=z,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};B.prototype=n.fn,y=n(z);var C=/^(?:parents|prev(?:Until|All))/,D={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=a[b];while(e&&9!==e.nodeType&&(void 0===c||1!==e.nodeType||!n(e).is(c)))1===e.nodeType&&d.push(e),e=e[b];return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b,c=n(a,this),d=c.length;return this.filter(function(){for(b=0;d>b;b++)if(n.contains(this,c[b]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?n.inArray(this[0],n(a)):n.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function E(a,b){do a=a[b];while(a&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return E(a,"nextSibling")},prev:function(a){return E(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return n.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(D[a]||(e=n.unique(e)),C.test(a)&&(e=e.reverse())),this.pushStack(e)}});var F=/\S+/g,G={};function H(a){var b=G[a]={};return n.each(a.match(F)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?G[a]||H(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(c=a.memory&&l,d=!0,f=g||0,g=0,e=h.length,b=!0;h&&e>f;f++)if(h[f].apply(l[0],l[1])===!1&&a.stopOnFalse){c=!1;break}b=!1,h&&(i?i.length&&j(i.shift()):c?h=[]:k.disable())},k={add:function(){if(h){var d=h.length;!function f(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&f(c)})}(arguments),b?e=h.length:c&&(g=d,j(c))}return this},remove:function(){return h&&n.each(arguments,function(a,c){var d;while((d=n.inArray(c,h,d))>-1)h.splice(d,1),b&&(e>=d&&e--,f>=d&&f--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],e=0,this},disable:function(){return h=i=c=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,c||k.disable(),this},locked:function(){return!i},fireWith:function(a,c){return!h||d&&!i||(c=c||[],c=[a,c.slice?c.slice():c],b?i.push(c):j(c)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!d}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var I;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){if(a===!0?!--n.readyWait:!n.isReady){if(!z.body)return setTimeout(n.ready);n.isReady=!0,a!==!0&&--n.readyWait>0||(I.resolveWith(z,[n]),n.fn.trigger&&n(z).trigger("ready").off("ready"))}}});function J(){z.addEventListener?(z.removeEventListener("DOMContentLoaded",K,!1),a.removeEventListener("load",K,!1)):(z.detachEvent("onreadystatechange",K),a.detachEvent("onload",K))}function K(){(z.addEventListener||"load"===event.type||"complete"===z.readyState)&&(J(),n.ready())}n.ready.promise=function(b){if(!I)if(I=n.Deferred(),"complete"===z.readyState)setTimeout(n.ready);else if(z.addEventListener)z.addEventListener("DOMContentLoaded",K,!1),a.addEventListener("load",K,!1);else{z.attachEvent("onreadystatechange",K),a.attachEvent("onload",K);var c=!1;try{c=null==a.frameElement&&z.documentElement}catch(d){}c&&c.doScroll&&!function e(){if(!n.isReady){try{c.doScroll("left")}catch(a){return setTimeout(e,50)}J(),n.ready()}}()}return I.promise(b)};var L="undefined",M;for(M in n(l))break;l.ownLast="0"!==M,l.inlineBlockNeedsLayout=!1,n(function(){var a,b,c=z.getElementsByTagName("body")[0];c&&(a=z.createElement("div"),a.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",b=z.createElement("div"),c.appendChild(a).appendChild(b),typeof b.style.zoom!==L&&(b.style.cssText="border:0;margin:0;width:1px;padding:1px;display:inline;zoom:1",(l.inlineBlockNeedsLayout=3===b.offsetWidth)&&(c.style.zoom=1)),c.removeChild(a),a=b=null)}),function(){var a=z.createElement("div");if(null==l.deleteExpando){l.deleteExpando=!0;try{delete a.test}catch(b){l.deleteExpando=!1}}a=null}(),n.acceptData=function(a){var b=n.noData[(a.nodeName+" ").toLowerCase()],c=+a.nodeType||1;return 1!==c&&9!==c?!1:!b||b!==!0&&a.getAttribute("classid")===b};var N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){if(void 0===c&&1===a.nodeType){var d="data-"+b.replace(O,"-$1").toLowerCase();if(c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}n.data(a,b,c)}else c=void 0}return c}function Q(a){var b;for(b in a)if(("data"!==b||!n.isEmptyObject(a[b]))&&"toJSON"!==b)return!1;return!0}function R(a,b,d,e){if(n.acceptData(a)){var f,g,h=n.expando,i=a.nodeType,j=i?n.cache:a,k=i?a[h]:a[h]&&h;if(k&&j[k]&&(e||j[k].data)||void 0!==d||"string"!=typeof b)return k||(k=i?a[h]=c.pop()||n.guid++:h),j[k]||(j[k]=i?{}:{toJSON:n.noop}),("object"==typeof b||"function"==typeof b)&&(e?j[k]=n.extend(j[k],b):j[k].data=n.extend(j[k].data,b)),g=j[k],e||(g.data||(g.data={}),g=g.data),void 0!==d&&(g[n.camelCase(b)]=d),"string"==typeof b?(f=g[b],null==f&&(f=g[n.camelCase(b)])):f=g,f +}}function S(a,b,c){if(n.acceptData(a)){var d,e,f=a.nodeType,g=f?n.cache:a,h=f?a[n.expando]:n.expando;if(g[h]){if(b&&(d=c?g[h]:g[h].data)){n.isArray(b)?b=b.concat(n.map(b,n.camelCase)):b in d?b=[b]:(b=n.camelCase(b),b=b in d?[b]:b.split(" ")),e=b.length;while(e--)delete d[b[e]];if(c?!Q(d):!n.isEmptyObject(d))return}(c||(delete g[h].data,Q(g[h])))&&(f?n.cleanData([a],!0):l.deleteExpando||g!=g.window?delete g[h]:g[h]=null)}}}n.extend({cache:{},noData:{"applet ":!0,"embed ":!0,"object ":"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(a){return a=a.nodeType?n.cache[a[n.expando]]:a[n.expando],!!a&&!Q(a)},data:function(a,b,c){return R(a,b,c)},removeData:function(a,b){return S(a,b)},_data:function(a,b,c){return R(a,b,c,!0)},_removeData:function(a,b){return S(a,b,!0)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=n.data(f),1===f.nodeType&&!n._data(f,"parsedAttrs"))){c=g.length;while(c--)d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d]));n._data(f,"parsedAttrs",!0)}return e}return"object"==typeof a?this.each(function(){n.data(this,a)}):arguments.length>1?this.each(function(){n.data(this,a,b)}):f?P(f,a,n.data(f,a)):void 0},removeData:function(a){return this.each(function(){n.removeData(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=n._data(a,b),c&&(!d||n.isArray(c)?d=n._data(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return n._data(a,c)||n._data(a,c,{empty:n.Callbacks("once memory").add(function(){n._removeData(a,b+"queue"),n._removeData(a,c)})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthh;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f},X=/^(?:checkbox|radio)$/i;!function(){var a=z.createDocumentFragment(),b=z.createElement("div"),c=z.createElement("input");if(b.setAttribute("className","t"),b.innerHTML="
a",l.leadingWhitespace=3===b.firstChild.nodeType,l.tbody=!b.getElementsByTagName("tbody").length,l.htmlSerialize=!!b.getElementsByTagName("link").length,l.html5Clone="<:nav>"!==z.createElement("nav").cloneNode(!0).outerHTML,c.type="checkbox",c.checked=!0,a.appendChild(c),l.appendChecked=c.checked,b.innerHTML="",l.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue,a.appendChild(b),b.innerHTML="",l.checkClone=b.cloneNode(!0).cloneNode(!0).lastChild.checked,l.noCloneEvent=!0,b.attachEvent&&(b.attachEvent("onclick",function(){l.noCloneEvent=!1}),b.cloneNode(!0).click()),null==l.deleteExpando){l.deleteExpando=!0;try{delete b.test}catch(d){l.deleteExpando=!1}}a=b=c=null}(),function(){var b,c,d=z.createElement("div");for(b in{submit:!0,change:!0,focusin:!0})c="on"+b,(l[b+"Bubbles"]=c in a)||(d.setAttribute(c,"t"),l[b+"Bubbles"]=d.attributes[c].expando===!1);d=null}();var Y=/^(?:input|select|textarea)$/i,Z=/^key/,$=/^(?:mouse|contextmenu)|click/,_=/^(?:focusinfocus|focusoutblur)$/,ab=/^([^.]*)(?:\.(.+)|)$/;function bb(){return!0}function cb(){return!1}function db(){try{return z.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n._data(a);if(r){c.handler&&(i=c,c=i.handler,e=i.selector),c.guid||(c.guid=n.guid++),(g=r.events)||(g=r.events={}),(k=r.handle)||(k=r.handle=function(a){return typeof n===L||a&&n.event.triggered===a.type?void 0:n.event.dispatch.apply(k.elem,arguments)},k.elem=a),b=(b||"").match(F)||[""],h=b.length;while(h--)f=ab.exec(b[h])||[],o=q=f[1],p=(f[2]||"").split(".").sort(),o&&(j=n.event.special[o]||{},o=(e?j.delegateType:j.bindType)||o,j=n.event.special[o]||{},l=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},i),(m=g[o])||(m=g[o]=[],m.delegateCount=0,j.setup&&j.setup.call(a,d,p,k)!==!1||(a.addEventListener?a.addEventListener(o,k,!1):a.attachEvent&&a.attachEvent("on"+o,k))),j.add&&(j.add.call(a,l),l.handler.guid||(l.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,l):m.push(l),n.event.global[o]=!0);a=null}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=n.hasData(a)&&n._data(a);if(r&&(k=r.events)){b=(b||"").match(F)||[""],j=b.length;while(j--)if(h=ab.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=k[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),i=f=m.length;while(f--)g=m[f],!e&&q!==g.origType||c&&c.guid!==g.guid||h&&!h.test(g.namespace)||d&&d!==g.selector&&("**"!==d||!g.selector)||(m.splice(f,1),g.selector&&m.delegateCount--,l.remove&&l.remove.call(a,g));i&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete k[o])}else for(o in k)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(k)&&(delete r.handle,n._removeData(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,l,m,o=[d||z],p=j.call(b,"type")?b.type:b,q=j.call(b,"namespace")?b.namespace.split("."):[];if(h=l=d=d||z,3!==d.nodeType&&8!==d.nodeType&&!_.test(p+n.event.triggered)&&(p.indexOf(".")>=0&&(q=p.split("."),p=q.shift(),q.sort()),g=p.indexOf(":")<0&&"on"+p,b=b[n.expando]?b:new n.Event(p,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=q.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+q.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),k=n.event.special[p]||{},e||!k.trigger||k.trigger.apply(d,c)!==!1)){if(!e&&!k.noBubble&&!n.isWindow(d)){for(i=k.delegateType||p,_.test(i+p)||(h=h.parentNode);h;h=h.parentNode)o.push(h),l=h;l===(d.ownerDocument||z)&&o.push(l.defaultView||l.parentWindow||a)}m=0;while((h=o[m++])&&!b.isPropagationStopped())b.type=m>1?i:k.bindType||p,f=(n._data(h,"events")||{})[b.type]&&n._data(h,"handle"),f&&f.apply(h,c),f=g&&h[g],f&&f.apply&&n.acceptData(h)&&(b.result=f.apply(h,c),b.result===!1&&b.preventDefault());if(b.type=p,!e&&!b.isDefaultPrevented()&&(!k._default||k._default.apply(o.pop(),c)===!1)&&n.acceptData(d)&&g&&d[p]&&!n.isWindow(d)){l=d[g],l&&(d[g]=null),n.event.triggered=p;try{d[p]()}catch(r){}n.event.triggered=void 0,l&&(d[g]=l)}return b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(n._data(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,g=0;while((e=f.handlers[g++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(e.namespace))&&(a.handleObj=e,a.data=e.data,c=((n.event.special[e.origType]||{}).handle||e.handler).apply(f.elem,i),void 0!==c&&(a.result=c)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!=this;i=i.parentNode||this)if(1===i.nodeType&&(i.disabled!==!0||"click"!==a.type)){for(e=[],f=0;h>f;f++)d=b[f],c=d.selector+" ",void 0===e[c]&&(e[c]=d.needsContext?n(c,this).index(i)>=0:n.find(c,this,null,[i]).length),e[c]&&e.push(d);e.length&&g.push({elem:i,handlers:e})}return h]","i"),ib=/^\s+/,jb=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,kb=/<([\w:]+)/,lb=/\s*$/g,sb={option:[1,""],legend:[1,"
","
"],area:[1,"",""],param:[1,"",""],thead:[1,"","
"],tr:[2,"","
"],col:[2,"","
"],td:[3,"","
"],_default:l.htmlSerialize?[0,"",""]:[1,"X
","
"]},tb=eb(z),ub=tb.appendChild(z.createElement("div"));sb.optgroup=sb.option,sb.tbody=sb.tfoot=sb.colgroup=sb.caption=sb.thead,sb.th=sb.td;function vb(a,b){var c,d,e=0,f=typeof a.getElementsByTagName!==L?a.getElementsByTagName(b||"*"):typeof a.querySelectorAll!==L?a.querySelectorAll(b||"*"):void 0;if(!f)for(f=[],c=a.childNodes||a;null!=(d=c[e]);e++)!b||n.nodeName(d,b)?f.push(d):n.merge(f,vb(d,b));return void 0===b||b&&n.nodeName(a,b)?n.merge([a],f):f}function wb(a){X.test(a.type)&&(a.defaultChecked=a.checked)}function xb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function yb(a){return a.type=(null!==n.find.attr(a,"type"))+"/"+a.type,a}function zb(a){var b=qb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function Ab(a,b){for(var c,d=0;null!=(c=a[d]);d++)n._data(c,"globalEval",!b||n._data(b[d],"globalEval"))}function Bb(a,b){if(1===b.nodeType&&n.hasData(a)){var c,d,e,f=n._data(a),g=n._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;e>d;d++)n.event.add(b,c,h[c][d])}g.data&&(g.data=n.extend({},g.data))}}function Cb(a,b){var c,d,e;if(1===b.nodeType){if(c=b.nodeName.toLowerCase(),!l.noCloneEvent&&b[n.expando]){e=n._data(b);for(d in e.events)n.removeEvent(b,d,e.handle);b.removeAttribute(n.expando)}"script"===c&&b.text!==a.text?(yb(b).text=a.text,zb(b)):"object"===c?(b.parentNode&&(b.outerHTML=a.outerHTML),l.html5Clone&&a.innerHTML&&!n.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):"input"===c&&X.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):"option"===c?b.defaultSelected=b.selected=a.defaultSelected:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}}n.extend({clone:function(a,b,c){var d,e,f,g,h,i=n.contains(a.ownerDocument,a);if(l.html5Clone||n.isXMLDoc(a)||!hb.test("<"+a.nodeName+">")?f=a.cloneNode(!0):(ub.innerHTML=a.outerHTML,ub.removeChild(f=ub.firstChild)),!(l.noCloneEvent&&l.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(d=vb(f),h=vb(a),g=0;null!=(e=h[g]);++g)d[g]&&Cb(e,d[g]);if(b)if(c)for(h=h||vb(a),d=d||vb(f),g=0;null!=(e=h[g]);g++)Bb(e,d[g]);else Bb(a,f);return d=vb(f,"script"),d.length>0&&Ab(d,!i&&vb(a,"script")),d=h=e=null,f},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k,m=a.length,o=eb(b),p=[],q=0;m>q;q++)if(f=a[q],f||0===f)if("object"===n.type(f))n.merge(p,f.nodeType?[f]:f);else if(mb.test(f)){h=h||o.appendChild(b.createElement("div")),i=(kb.exec(f)||["",""])[1].toLowerCase(),k=sb[i]||sb._default,h.innerHTML=k[1]+f.replace(jb,"<$1>")+k[2],e=k[0];while(e--)h=h.lastChild;if(!l.leadingWhitespace&&ib.test(f)&&p.push(b.createTextNode(ib.exec(f)[0])),!l.tbody){f="table"!==i||lb.test(f)?""!==k[1]||lb.test(f)?0:h:h.firstChild,e=f&&f.childNodes.length;while(e--)n.nodeName(j=f.childNodes[e],"tbody")&&!j.childNodes.length&&f.removeChild(j)}n.merge(p,h.childNodes),h.textContent="";while(h.firstChild)h.removeChild(h.firstChild);h=o.lastChild}else p.push(b.createTextNode(f));h&&o.removeChild(h),l.appendChecked||n.grep(vb(p,"input"),wb),q=0;while(f=p[q++])if((!d||-1===n.inArray(f,d))&&(g=n.contains(f.ownerDocument,f),h=vb(o.appendChild(f),"script"),g&&Ab(h),c)){e=0;while(f=h[e++])pb.test(f.type||"")&&c.push(f)}return h=null,o},cleanData:function(a,b){for(var d,e,f,g,h=0,i=n.expando,j=n.cache,k=l.deleteExpando,m=n.event.special;null!=(d=a[h]);h++)if((b||n.acceptData(d))&&(f=d[i],g=f&&j[f])){if(g.events)for(e in g.events)m[e]?n.event.remove(d,e):n.removeEvent(d,e,g.handle);j[f]&&(delete j[f],k?delete d[i]:typeof d.removeAttribute!==L?d.removeAttribute(i):d[i]=null,c.push(f))}}}),n.fn.extend({text:function(a){return W(this,function(a){return void 0===a?n.text(this):this.empty().append((this[0]&&this[0].ownerDocument||z).createTextNode(a))},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=xb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(vb(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&Ab(vb(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++){1===a.nodeType&&n.cleanData(vb(a,!1));while(a.firstChild)a.removeChild(a.firstChild);a.options&&n.nodeName(a,"select")&&(a.options.length=0)}return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return W(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a)return 1===b.nodeType?b.innerHTML.replace(gb,""):void 0;if(!("string"!=typeof a||nb.test(a)||!l.htmlSerialize&&hb.test(a)||!l.leadingWhitespace&&ib.test(a)||sb[(kb.exec(a)||["",""])[1].toLowerCase()])){a=a.replace(jb,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(vb(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(vb(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,k=this.length,m=this,o=k-1,p=a[0],q=n.isFunction(p);if(q||k>1&&"string"==typeof p&&!l.checkClone&&ob.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(k&&(i=n.buildFragment(a,this[0].ownerDocument,!1,this),c=i.firstChild,1===i.childNodes.length&&(i=c),c)){for(g=n.map(vb(i,"script"),yb),f=g.length;k>j;j++)d=i,j!==o&&(d=n.clone(d,!0,!0),f&&n.merge(g,vb(d,"script"))),b.call(this[j],d,j);if(f)for(h=g[g.length-1].ownerDocument,n.map(g,zb),j=0;f>j;j++)d=g[j],pb.test(d.type||"")&&!n._data(d,"globalEval")&&n.contains(h,d)&&(d.src?n._evalUrl&&n._evalUrl(d.src):n.globalEval((d.text||d.textContent||d.innerHTML||"").replace(rb,"")));i=c=null}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=0,e=[],g=n(a),h=g.length-1;h>=d;d++)c=d===h?this:this.clone(!0),n(g[d])[b](c),f.apply(e,c.get());return this.pushStack(e)}});var Db,Eb={};function Fb(b,c){var d=n(c.createElement(b)).appendTo(c.body),e=a.getDefaultComputedStyle?a.getDefaultComputedStyle(d[0]).display:n.css(d[0],"display");return d.detach(),e}function Gb(a){var b=z,c=Eb[a];return c||(c=Fb(a,b),"none"!==c&&c||(Db=(Db||n("