Renamed package to fr.devinsy.
This commit is contained in:
parent
62b95f1ccf
commit
3d8d6ec8a2
49 changed files with 154 additions and 148 deletions
|
@ -83,7 +83,7 @@
|
||||||
<mkdir dir="${dist.dir}"/>
|
<mkdir dir="${dist.dir}"/>
|
||||||
|
|
||||||
<!-- Update build_information.properties file -->
|
<!-- Update build_information.properties file -->
|
||||||
<property name="build.information.file" value="${build.classes}/org/april/agirstatool/build_information.properties" />
|
<property name="build.information.file" value="${build.classes}/fr/devinsy/agirstatool/build_information.properties" />
|
||||||
<propertyfile file="${build.information.file}" >
|
<propertyfile file="${build.information.file}" >
|
||||||
<entry key="product.name" value="${product.name}"/>
|
<entry key="product.name" value="${product.name}"/>
|
||||||
<entry key="product.revision.major" value="${product.revision.major}"/>
|
<entry key="product.revision.major" value="${product.revision.major}"/>
|
||||||
|
@ -111,7 +111,7 @@
|
||||||
<manifest>
|
<manifest>
|
||||||
<attribute name="Built-By" value="${user.name} using ant" />
|
<attribute name="Built-By" value="${user.name} using ant" />
|
||||||
<attribute name="Built-Date" value="${dist.time}" />
|
<attribute name="Built-Date" value="${dist.time}" />
|
||||||
<attribute name="Main-Class" value = "org.april.agirstatool.AgirStatoolLauncher"/>
|
<attribute name="Main-Class" value = "fr.devinsy.agirstatool.AgirStatoolLauncher"/>
|
||||||
</manifest>
|
</manifest>
|
||||||
<fileset dir="${build.classes}" />
|
<fileset dir="${build.classes}" />
|
||||||
<!--zipfileset dir="${basedir}/lib" includes="${toString:project.libs}" /-->
|
<!--zipfileset dir="${basedir}/lib" includes="${toString:project.libs}" /-->
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
# priority setting: DEBUG < INFO < WARN < ERROR
|
# priority setting: DEBUG < INFO < WARN < ERROR
|
||||||
log4j.rootLogger = DEBUG, console
|
log4j.rootLogger = DEBUG, console
|
||||||
log4j.logger.org.april.agirstatool = INFO
|
log4j.logger.fr.devinsy.agirstatool = INFO
|
||||||
log4j.logger.fr.devinsy.xidyn = WARN
|
log4j.logger.fr.devinsy.xidyn = WARN
|
||||||
|
|
||||||
#--
|
#--
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
database.url=jdbc:mysql://localhost/
|
database.url=jdbc:mysql://localhost/
|
||||||
database.name=agir2020
|
database.name=agir2020
|
||||||
database.login=admin
|
database.login=admin
|
||||||
database.password=suko7Gun
|
database.password=xxxxxxx
|
||||||
|
|
||||||
targetDirectory=/home/cpm/Projets/AgirStatool/TestZone/www
|
targetDirectory=/home/cpm/Projets/AgirStatool/TestZone/www
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
|
|
||||||
# priority setting: DEBUG < INFO < WARN < ERROR
|
# priority setting: DEBUG < INFO < WARN < ERROR
|
||||||
log4j.rootLogger = INFO, stdout, LogWriter
|
log4j.rootLogger = INFO, stdout, LogWriter
|
||||||
log4j.logger.org.april.agirstatool = INFO
|
log4j.logger.fr.devinsy.agirstatool = INFO
|
||||||
log4j.logger.fr.devinsy.xidyn = INFO
|
log4j.logger.fr.devinsy.xidyn = INFO
|
||||||
|
|
||||||
#--
|
#--
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool;
|
package fr.devinsy.agirstatool;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
|
@ -24,10 +24,11 @@ import org.apache.log4j.BasicConfigurator;
|
||||||
import org.apache.log4j.ConsoleAppender;
|
import org.apache.log4j.ConsoleAppender;
|
||||||
import org.apache.log4j.EnhancedPatternLayout;
|
import org.apache.log4j.EnhancedPatternLayout;
|
||||||
import org.apache.log4j.PropertyConfigurator;
|
import org.apache.log4j.PropertyConfigurator;
|
||||||
import org.april.agirstatool.cli.AgirStatoolCLI;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import fr.devinsy.agirstatool.cli.AgirStatoolCLI;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Class JugaLauncher.
|
* The Class JugaLauncher.
|
||||||
*/
|
*/
|
|
@ -16,7 +16,7 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.charts;
|
package fr.devinsy.agirstatool.charts;
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.charts;
|
package fr.devinsy.agirstatool.charts;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.charts;
|
package fr.devinsy.agirstatool.charts;
|
||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
|
|
|
@ -16,18 +16,18 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.cli;
|
package fr.devinsy.agirstatool.cli;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
import org.apache.log4j.PropertyConfigurator;
|
import org.apache.log4j.PropertyConfigurator;
|
||||||
import org.april.agirstatool.core.AgirStatool;
|
|
||||||
import org.april.agirstatool.core.AgirStatoolException;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatool;
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolException;
|
||||||
import fr.devinsy.strings.StringList;
|
import fr.devinsy.strings.StringList;
|
||||||
import utils.BuildInformation;
|
import utils.BuildInformation;
|
||||||
|
|
|
@ -16,9 +16,9 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.cli;
|
package fr.devinsy.agirstatool.cli;
|
||||||
|
|
||||||
import org.april.agirstatool.core.AgirStatoolException;
|
import fr.devinsy.agirstatool.core.AgirStatoolException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Class JugaCLIException.
|
* The Class JugaCLIException.
|
|
@ -16,7 +16,7 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.cli;
|
package fr.devinsy.agirstatool.cli;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileReader;
|
import java.io.FileReader;
|
||||||
|
@ -25,10 +25,11 @@ import java.util.Properties;
|
||||||
|
|
||||||
import org.apache.commons.io.IOUtils;
|
import org.apache.commons.io.IOUtils;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.april.agirstatool.core.AgirStatoolException;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Class AgirStatoolConfigFile.
|
* The Class AgirStatoolConfigFile.
|
||||||
*/
|
*/
|
|
@ -17,7 +17,7 @@
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.april.agirstatool.cli;
|
package fr.devinsy.agirstatool.cli;
|
||||||
|
|
||||||
import java.sql.Connection;
|
import java.sql.Connection;
|
||||||
import java.sql.DriverManager;
|
import java.sql.DriverManager;
|
||||||
|
@ -28,10 +28,11 @@ import java.time.LocalDateTime;
|
||||||
import java.time.ZoneOffset;
|
import java.time.ZoneOffset;
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.april.agirstatool.core.AgirStatoolException;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Class SQLUtils.
|
* The Class SQLUtils.
|
||||||
*/
|
*/
|
|
@ -16,7 +16,7 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core;
|
package fr.devinsy.agirstatool.core;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.io.FileFilter;
|
import java.io.FileFilter;
|
||||||
|
@ -31,14 +31,14 @@ import java.time.ZoneOffset;
|
||||||
|
|
||||||
import org.apache.commons.io.FileUtils;
|
import org.apache.commons.io.FileUtils;
|
||||||
import org.apache.commons.io.filefilter.WildcardFileFilter;
|
import org.apache.commons.io.filefilter.WildcardFileFilter;
|
||||||
import org.april.agirstatool.charts.DateCount;
|
|
||||||
import org.april.agirstatool.charts.DateCountList;
|
|
||||||
import org.april.agirstatool.charts.DateCountMap;
|
|
||||||
import org.april.agirstatool.cli.SQLUtils;
|
|
||||||
import org.april.agirstatool.core.pages.ProjectPage;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import fr.devinsy.agirstatool.charts.DateCount;
|
||||||
|
import fr.devinsy.agirstatool.charts.DateCountList;
|
||||||
|
import fr.devinsy.agirstatool.charts.DateCountMap;
|
||||||
|
import fr.devinsy.agirstatool.cli.SQLUtils;
|
||||||
|
import fr.devinsy.agirstatool.core.pages.ProjectPage;
|
||||||
import fr.devinsy.strings.StringList;
|
import fr.devinsy.strings.StringList;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -208,10 +208,10 @@ public class AgirStatool
|
||||||
// Copy CSS file.
|
// Copy CSS file.
|
||||||
if (!new File(this.targetDirectory, "index.html").exists())
|
if (!new File(this.targetDirectory, "index.html").exists())
|
||||||
{
|
{
|
||||||
FileUtils.copyURLToFile(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/index.html"), new File(this.targetDirectory, "index.html"));
|
FileUtils.copyURLToFile(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/index.html"), new File(this.targetDirectory, "index.html"));
|
||||||
FileUtils.copyURLToFile(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/agirstatool.css"), new File(this.targetDirectory, "agirstatool.css"));
|
FileUtils.copyURLToFile(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/agirstatool.css"), new File(this.targetDirectory, "agirstatool.css"));
|
||||||
FileUtils.copyURLToFile(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/Chart.bundle.min.js"), new File(this.targetDirectory, "Chart.bundle.min.js"));
|
FileUtils.copyURLToFile(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/Chart.bundle.min.js"), new File(this.targetDirectory, "Chart.bundle.min.js"));
|
||||||
FileUtils.copyURLToFile(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/about.xhtml"), new File(this.targetDirectory, "about.xhtml"));
|
FileUtils.copyURLToFile(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/about.xhtml"), new File(this.targetDirectory, "about.xhtml"));
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
|
@ -16,7 +16,7 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core;
|
package fr.devinsy.agirstatool.core;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Class JugaException.
|
* The Class JugaException.
|
|
@ -16,7 +16,7 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core;
|
package fr.devinsy.agirstatool.core;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
@ -27,12 +27,12 @@ import java.util.Locale;
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.commons.lang3.math.NumberUtils;
|
import org.apache.commons.lang3.math.NumberUtils;
|
||||||
import org.april.agirstatool.charts.DateCount;
|
|
||||||
import org.april.agirstatool.charts.DateCountList;
|
|
||||||
import org.april.agirstatool.charts.DateCountMap;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import fr.devinsy.agirstatool.charts.DateCount;
|
||||||
|
import fr.devinsy.agirstatool.charts.DateCountList;
|
||||||
|
import fr.devinsy.agirstatool.charts.DateCountMap;
|
||||||
import fr.devinsy.strings.StringList;
|
import fr.devinsy.strings.StringList;
|
||||||
import fr.devinsy.strings.StringsUtils;
|
import fr.devinsy.strings.StringsUtils;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package org.april.agirstatool.core;
|
package fr.devinsy.agirstatool.core;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core;
|
package fr.devinsy.agirstatool.core;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
|
@ -1,4 +1,4 @@
|
||||||
package org.april.agirstatool.core;
|
package fr.devinsy.agirstatool.core;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
|
@ -16,11 +16,11 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core;
|
package fr.devinsy.agirstatool.core;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
import org.april.agirstatool.charts.DateCountList;
|
import fr.devinsy.agirstatool.charts.DateCountList;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Class Projects.
|
* The Class Projects.
|
|
@ -16,7 +16,7 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core;
|
package fr.devinsy.agirstatool.core;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
|
@ -16,7 +16,7 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core;
|
package fr.devinsy.agirstatool.core;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
|
@ -16,7 +16,7 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core;
|
package fr.devinsy.agirstatool.core;
|
||||||
|
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
package org.april.agirstatool.core;
|
package fr.devinsy.agirstatool.core;
|
||||||
|
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core;
|
package fr.devinsy.agirstatool.core;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core;
|
package fr.devinsy.agirstatool.core;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Class Stat.
|
* The Class Stat.
|
|
@ -16,20 +16,20 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core.pages;
|
package fr.devinsy.agirstatool.core.pages;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
|
||||||
import org.apache.commons.codec.digest.DigestUtils;
|
import org.apache.commons.codec.digest.DigestUtils;
|
||||||
import org.april.agirstatool.charts.DateCountList;
|
|
||||||
import org.april.agirstatool.core.AgirStatool;
|
|
||||||
import org.april.agirstatool.core.AgirStatoolException;
|
|
||||||
import org.april.agirstatool.core.AgirStatoolUtils;
|
|
||||||
import org.april.agirstatool.core.Project;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import fr.devinsy.agirstatool.charts.DateCountList;
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatool;
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolException;
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolUtils;
|
||||||
|
import fr.devinsy.agirstatool.core.Project;
|
||||||
import fr.devinsy.strings.StringList;
|
import fr.devinsy.strings.StringList;
|
||||||
import fr.devinsy.xidyn.utils.XidynUtils;
|
import fr.devinsy.xidyn.utils.XidynUtils;
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ public class CreatedClosedCountChartView
|
||||||
{
|
{
|
||||||
if (project.hasIssue())
|
if (project.hasIssue())
|
||||||
{
|
{
|
||||||
String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/createdClosedCountChartView.xhtml"));
|
String source = XidynUtils.load(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/createdClosedCountChartView.xhtml"));
|
||||||
String code = XidynUtils.extractBodyContent(source);
|
String code = XidynUtils.extractBodyContent(source);
|
||||||
|
|
||||||
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "lineChart"));
|
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "lineChart"));
|
||||||
|
@ -115,7 +115,7 @@ public class CreatedClosedCountChartView
|
||||||
|
|
||||||
if (project.hasIssue())
|
if (project.hasIssue())
|
||||||
{
|
{
|
||||||
String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/createdClosedCountChartView.xhtml"));
|
String source = XidynUtils.load(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/createdClosedCountChartView.xhtml"));
|
||||||
String code = XidynUtils.extractBodyContent(source);
|
String code = XidynUtils.extractBodyContent(source);
|
||||||
|
|
||||||
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "lineBar"));
|
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "lineBar"));
|
|
@ -16,21 +16,21 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core.pages;
|
package fr.devinsy.agirstatool.core.pages;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
|
||||||
import org.apache.commons.codec.digest.DigestUtils;
|
import org.apache.commons.codec.digest.DigestUtils;
|
||||||
import org.april.agirstatool.charts.DateCount;
|
|
||||||
import org.april.agirstatool.charts.DateCountList;
|
|
||||||
import org.april.agirstatool.core.AgirStatool;
|
|
||||||
import org.april.agirstatool.core.AgirStatoolException;
|
|
||||||
import org.april.agirstatool.core.AgirStatoolUtils;
|
|
||||||
import org.april.agirstatool.core.Project;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import fr.devinsy.agirstatool.charts.DateCount;
|
||||||
|
import fr.devinsy.agirstatool.charts.DateCountList;
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatool;
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolException;
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolUtils;
|
||||||
|
import fr.devinsy.agirstatool.core.Project;
|
||||||
import fr.devinsy.strings.StringList;
|
import fr.devinsy.strings.StringList;
|
||||||
import fr.devinsy.xidyn.utils.XidynUtils;
|
import fr.devinsy.xidyn.utils.XidynUtils;
|
||||||
|
|
||||||
|
@ -64,7 +64,7 @@ public class CreatedClosedDiffChartView
|
||||||
{
|
{
|
||||||
if (project.hasIssue())
|
if (project.hasIssue())
|
||||||
{
|
{
|
||||||
String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/createdClosedDiffChartView.xhtml"));
|
String source = XidynUtils.load(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/createdClosedDiffChartView.xhtml"));
|
||||||
String code = XidynUtils.extractBodyContent(source);
|
String code = XidynUtils.extractBodyContent(source);
|
||||||
|
|
||||||
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "line2Chart"));
|
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "line2Chart"));
|
|
@ -16,19 +16,19 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core.pages;
|
package fr.devinsy.agirstatool.core.pages;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
|
|
||||||
import org.apache.commons.codec.digest.DigestUtils;
|
import org.apache.commons.codec.digest.DigestUtils;
|
||||||
import org.april.agirstatool.core.AgirStatool;
|
|
||||||
import org.april.agirstatool.core.AgirStatoolException;
|
|
||||||
import org.april.agirstatool.core.AgirStatoolUtils;
|
|
||||||
import org.april.agirstatool.core.Project;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatool;
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolException;
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolUtils;
|
||||||
|
import fr.devinsy.agirstatool.core.Project;
|
||||||
import fr.devinsy.strings.StringList;
|
import fr.devinsy.strings.StringList;
|
||||||
import fr.devinsy.xidyn.utils.XidynUtils;
|
import fr.devinsy.xidyn.utils.XidynUtils;
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ public class IssueAgeChartView
|
||||||
{
|
{
|
||||||
if (project.hasIssue())
|
if (project.hasIssue())
|
||||||
{
|
{
|
||||||
String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/issueAgeChartView.xhtml"));
|
String source = XidynUtils.load(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/issueAgeChartView.xhtml"));
|
||||||
String code = XidynUtils.extractBodyContent(source);
|
String code = XidynUtils.extractBodyContent(source);
|
||||||
|
|
||||||
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "ageStatsChart"));
|
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "ageStatsChart"));
|
|
@ -16,18 +16,18 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core.pages;
|
package fr.devinsy.agirstatool.core.pages;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
import org.apache.commons.codec.digest.DigestUtils;
|
import org.apache.commons.codec.digest.DigestUtils;
|
||||||
import org.april.agirstatool.core.AgirStatool;
|
|
||||||
import org.april.agirstatool.core.AgirStatoolException;
|
|
||||||
import org.april.agirstatool.core.AgirStatoolUtils;
|
|
||||||
import org.april.agirstatool.core.Project;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatool;
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolException;
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolUtils;
|
||||||
|
import fr.devinsy.agirstatool.core.Project;
|
||||||
import fr.devinsy.strings.StringList;
|
import fr.devinsy.strings.StringList;
|
||||||
import fr.devinsy.xidyn.utils.XidynUtils;
|
import fr.devinsy.xidyn.utils.XidynUtils;
|
||||||
|
|
||||||
|
@ -89,7 +89,7 @@ public class IssueStatusChartView
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/issueStatusChartView.xhtml"));
|
String source = XidynUtils.load(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/issueStatusChartView.xhtml"));
|
||||||
String code = XidynUtils.extractBodyContent(source);
|
String code = XidynUtils.extractBodyContent(source);
|
||||||
|
|
||||||
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "chartBar"));
|
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "chartBar"));
|
|
@ -16,7 +16,7 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core.pages;
|
package fr.devinsy.agirstatool.core.pages;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
@ -24,11 +24,11 @@ import java.time.format.DateTimeFormatter;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.april.agirstatool.core.AgirStatoolException;
|
|
||||||
import org.april.agirstatool.core.Project;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolException;
|
||||||
|
import fr.devinsy.agirstatool.core.Project;
|
||||||
import fr.devinsy.xidyn.XidynException;
|
import fr.devinsy.xidyn.XidynException;
|
||||||
import fr.devinsy.xidyn.data.TagDataManager;
|
import fr.devinsy.xidyn.data.TagDataManager;
|
||||||
import fr.devinsy.xidyn.presenters.PresenterUtils;
|
import fr.devinsy.xidyn.presenters.PresenterUtils;
|
||||||
|
@ -66,11 +66,11 @@ public class ProjectPage
|
||||||
data.setAttribute("projectName", "href", project.getPath());
|
data.setAttribute("projectName", "href", project.getPath());
|
||||||
if (StringUtils.equals(project.getIdentifier(), "all"))
|
if (StringUtils.equals(project.getIdentifier(), "all"))
|
||||||
{
|
{
|
||||||
data.setAttribute("agirLink", "href", "https://agir.april.org/issues");
|
data.setAttribute("agirLink", "href", "https://agir.foo.org/issues");
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
data.setAttribute("agirLink", "href", "https://agir.april.org/projects/" + project.getIdentifier() + "/issues");
|
data.setAttribute("agirLink", "href", "https://agir.foo.org/projects/" + project.getIdentifier() + "/issues");
|
||||||
}
|
}
|
||||||
data.setContent("versionsup", BuildInformation.instance().version());
|
data.setContent("versionsup", BuildInformation.instance().version());
|
||||||
|
|
||||||
|
@ -115,7 +115,7 @@ public class ProjectPage
|
||||||
String projectsGroupedView = ProjectsGroupedView.build(project);
|
String projectsGroupedView = ProjectsGroupedView.build(project);
|
||||||
data.setContent("tableGroupedView", projectsGroupedView);
|
data.setContent("tableGroupedView", projectsGroupedView);
|
||||||
|
|
||||||
result = PresenterUtils.dynamize("/org/april/agirstatool/core/pages/project.xhtml", data).toString();
|
result = PresenterUtils.dynamize("/fr/devinsy/agirstatool/core/pages/project.xhtml", data).toString();
|
||||||
}
|
}
|
||||||
catch (XidynException exception)
|
catch (XidynException exception)
|
||||||
{
|
{
|
|
@ -16,15 +16,15 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core.pages;
|
package fr.devinsy.agirstatool.core.pages;
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringEscapeUtils;
|
import org.apache.commons.lang3.StringEscapeUtils;
|
||||||
import org.april.agirstatool.core.AgirStatoolException;
|
|
||||||
import org.april.agirstatool.core.AgirStatoolUtils;
|
|
||||||
import org.april.agirstatool.core.Project;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolException;
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolUtils;
|
||||||
|
import fr.devinsy.agirstatool.core.Project;
|
||||||
import fr.devinsy.xidyn.XidynException;
|
import fr.devinsy.xidyn.XidynException;
|
||||||
import fr.devinsy.xidyn.data.TagDataManager;
|
import fr.devinsy.xidyn.data.TagDataManager;
|
||||||
import fr.devinsy.xidyn.presenters.PresenterUtils;
|
import fr.devinsy.xidyn.presenters.PresenterUtils;
|
||||||
|
@ -73,7 +73,7 @@ public class ProjectsGroupedView
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CharSequence page = PresenterUtils.dynamize("/org/april/agirstatool/core/pages/projectsGroupedView.xhtml", data);
|
CharSequence page = PresenterUtils.dynamize("/fr/devinsy/agirstatool/core/pages/projectsGroupedView.xhtml", data);
|
||||||
result = XidynUtils.extractBodyContent(page);
|
result = XidynUtils.extractBodyContent(page);
|
||||||
}
|
}
|
||||||
catch (XidynException exception)
|
catch (XidynException exception)
|
|
@ -16,15 +16,15 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core.pages;
|
package fr.devinsy.agirstatool.core.pages;
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringEscapeUtils;
|
import org.apache.commons.lang3.StringEscapeUtils;
|
||||||
import org.april.agirstatool.core.AgirStatoolException;
|
|
||||||
import org.april.agirstatool.core.AgirStatoolUtils;
|
|
||||||
import org.april.agirstatool.core.Project;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolException;
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolUtils;
|
||||||
|
import fr.devinsy.agirstatool.core.Project;
|
||||||
import fr.devinsy.xidyn.XidynException;
|
import fr.devinsy.xidyn.XidynException;
|
||||||
import fr.devinsy.xidyn.data.TagDataManager;
|
import fr.devinsy.xidyn.data.TagDataManager;
|
||||||
import fr.devinsy.xidyn.presenters.PresenterUtils;
|
import fr.devinsy.xidyn.presenters.PresenterUtils;
|
||||||
|
@ -71,7 +71,7 @@ public class ProjectsRawView
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
CharSequence page = PresenterUtils.dynamize("/org/april/agirstatool/core/pages/projectsRawView.xhtml", data);
|
CharSequence page = PresenterUtils.dynamize("/fr/devinsy/agirstatool/core/pages/projectsRawView.xhtml", data);
|
||||||
result = XidynUtils.extractBodyContent(page);
|
result = XidynUtils.extractBodyContent(page);
|
||||||
}
|
}
|
||||||
catch (XidynException exception)
|
catch (XidynException exception)
|
|
@ -16,19 +16,19 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core.pages;
|
package fr.devinsy.agirstatool.core.pages;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
|
||||||
import org.apache.commons.codec.digest.DigestUtils;
|
import org.apache.commons.codec.digest.DigestUtils;
|
||||||
import org.april.agirstatool.core.AgirStatool;
|
|
||||||
import org.april.agirstatool.core.AgirStatoolException;
|
|
||||||
import org.april.agirstatool.core.AgirStatoolUtils;
|
|
||||||
import org.april.agirstatool.core.IssueStats;
|
|
||||||
import org.april.agirstatool.core.Project;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatool;
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolException;
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolUtils;
|
||||||
|
import fr.devinsy.agirstatool.core.IssueStats;
|
||||||
|
import fr.devinsy.agirstatool.core.Project;
|
||||||
import fr.devinsy.strings.StringList;
|
import fr.devinsy.strings.StringList;
|
||||||
import fr.devinsy.xidyn.utils.XidynUtils;
|
import fr.devinsy.xidyn.utils.XidynUtils;
|
||||||
|
|
||||||
|
@ -39,35 +39,6 @@ public class UnassignedIssueChartView
|
||||||
{
|
{
|
||||||
private static Logger logger = LoggerFactory.getLogger(UnassignedIssueChartView.class);
|
private static Logger logger = LoggerFactory.getLogger(UnassignedIssueChartView.class);
|
||||||
|
|
||||||
/**
|
|
||||||
* Builds the grouped.
|
|
||||||
*
|
|
||||||
* @param title
|
|
||||||
* the title
|
|
||||||
* @param project
|
|
||||||
* the project
|
|
||||||
* @return the string
|
|
||||||
* @throws AgirStatoolException
|
|
||||||
* the agir statool exception
|
|
||||||
*/
|
|
||||||
public static String buildGrouped(final String title, final Project project) throws AgirStatoolException
|
|
||||||
{
|
|
||||||
String result;
|
|
||||||
|
|
||||||
StringList labels = new StringList("Started", "Resolved", "Concluded");
|
|
||||||
StringList values = new StringList();
|
|
||||||
IssueStats stats = project.issueStats();
|
|
||||||
values.append(stats.getUnassignedStartedCount());
|
|
||||||
values.append(stats.getUnassignedResolvedCount());
|
|
||||||
values.append(stats.getUnassignedConcludedCount());
|
|
||||||
|
|
||||||
String targetTitle = title + " – " + project.getName();
|
|
||||||
result = build(targetTitle, targetTitle, labels, values);
|
|
||||||
|
|
||||||
//
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Builds the.
|
* Builds the.
|
||||||
*
|
*
|
||||||
|
@ -121,7 +92,7 @@ public class UnassignedIssueChartView
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
String source = XidynUtils.load(AgirStatool.class.getResource("/org/april/agirstatool/core/pages/unassignedIssueChart.xhtml"));
|
String source = XidynUtils.load(AgirStatool.class.getResource("/fr/devinsy/agirstatool/core/pages/unassignedIssueChart.xhtml"));
|
||||||
String code = XidynUtils.extractBodyContent(source);
|
String code = XidynUtils.extractBodyContent(source);
|
||||||
|
|
||||||
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "chartPolar"));
|
code = code.replaceAll("myChart", "myChart_" + DigestUtils.md5Hex(title + "chartPolar"));
|
||||||
|
@ -139,4 +110,33 @@ public class UnassignedIssueChartView
|
||||||
//
|
//
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Builds the grouped.
|
||||||
|
*
|
||||||
|
* @param title
|
||||||
|
* the title
|
||||||
|
* @param project
|
||||||
|
* the project
|
||||||
|
* @return the string
|
||||||
|
* @throws AgirStatoolException
|
||||||
|
* the agir statool exception
|
||||||
|
*/
|
||||||
|
public static String buildGrouped(final String title, final Project project) throws AgirStatoolException
|
||||||
|
{
|
||||||
|
String result;
|
||||||
|
|
||||||
|
StringList labels = new StringList("Started", "Resolved", "Concluded");
|
||||||
|
StringList values = new StringList();
|
||||||
|
IssueStats stats = project.issueStats();
|
||||||
|
values.append(stats.getUnassignedStartedCount());
|
||||||
|
values.append(stats.getUnassignedResolvedCount());
|
||||||
|
values.append(stats.getUnassignedConcludedCount());
|
||||||
|
|
||||||
|
String targetTitle = title + " – " + project.getName();
|
||||||
|
result = build(targetTitle, targetTitle, labels, values);
|
||||||
|
|
||||||
|
//
|
||||||
|
return result;
|
||||||
|
}
|
||||||
}
|
}
|
|
@ -4,7 +4,7 @@
|
||||||
<head>
|
<head>
|
||||||
<title>Agir Statool</title>
|
<title>Agir Statool</title>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta content="April" name="keywords" />
|
<meta content="Redmine" name="keywords" />
|
||||||
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
||||||
<link rel="stylesheet" type="text/css" href="agirstatool.css" />
|
<link rel="stylesheet" type="text/css" href="agirstatool.css" />
|
||||||
<script src="/commons/sorttable.js" />
|
<script src="/commons/sorttable.js" />
|
||||||
|
@ -15,9 +15,9 @@
|
||||||
<h1><a href="index.xhtml">Agir Statool</a> – <a id="" href="about.xhtml">About</a></h1>
|
<h1><a href="index.xhtml">Agir Statool</a> – <a id="" href="about.xhtml">About</a></h1>
|
||||||
|
|
||||||
<h2>Introduction</h2>
|
<h2>Introduction</h2>
|
||||||
<p>AgirStatool is a simple statistic tool software for the April Redmine instance:</p>
|
<p>AgirStatool is a simple statistic tool software for the FOO Redmine instance:</p>
|
||||||
<ul>
|
<ul>
|
||||||
<li><a href="https://agir.april.org/">https://agir.april.org/</a></li>
|
<li><a href="https://agir.foo.org/">https://agir.foo.org/</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
<h2>Tips</h2>
|
<h2>Tips</h2>
|
||||||
|
@ -30,9 +30,9 @@
|
||||||
<h2>License and source repository</h2>
|
<h2>License and source repository</h2>
|
||||||
<p>The original author of AgirStatool is Christian P. MOMON.</p>
|
<p>The original author of AgirStatool is Christian P. MOMON.</p>
|
||||||
<p>Agir Statool is a free software released under the GNU AGPL license.</p>
|
<p>Agir Statool is a free software released under the GNU AGPL license.</p>
|
||||||
<p>The official source repository is the April forge:</p>
|
<p>The official source repository is the Devinsy forge:</p>
|
||||||
<ul>
|
<ul>
|
||||||
<li><a href="https://forge.april.org/adminsys/agirstatool">https://forge.april.org/adminsys/agirstatool</a></li>
|
<li><a href="https://forge.devinsy.fr/cpm/agirstatool">https://forge.devinsy.fr/cpm/agirstatool</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
|
@ -4,7 +4,7 @@
|
||||||
<head>
|
<head>
|
||||||
<title>Agir Statool</title>
|
<title>Agir Statool</title>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta content="April" name="keywords" />
|
<meta content="Redmine" name="keywords" />
|
||||||
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
||||||
<link rel="stylesheet" type="text/css" href="agirstatool.css" />
|
<link rel="stylesheet" type="text/css" href="agirstatool.css" />
|
||||||
<script src="/commons/sorttable.js" />
|
<script src="/commons/sorttable.js" />
|
|
@ -4,7 +4,7 @@
|
||||||
<head>
|
<head>
|
||||||
<title>Agir Statool</title>
|
<title>Agir Statool</title>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta content="April" name="keywords" />
|
<meta content="Redmine" name="keywords" />
|
||||||
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
||||||
<link rel="stylesheet" type="text/css" href="agirstatool.css" />
|
<link rel="stylesheet" type="text/css" href="agirstatool.css" />
|
||||||
<script src="/commons/sorttable.js" />
|
<script src="/commons/sorttable.js" />
|
|
@ -4,7 +4,7 @@
|
||||||
<head>
|
<head>
|
||||||
<title>Agir Statool</title>
|
<title>Agir Statool</title>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta content="April" name="keywords" />
|
<meta content="Redmine" name="keywords" />
|
||||||
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
||||||
<link rel="stylesheet" type="text/css" href="agirstatool.css" />
|
<link rel="stylesheet" type="text/css" href="agirstatool.css" />
|
||||||
<script src="/commons/sorttable.js" />
|
<script src="/commons/sorttable.js" />
|
|
@ -4,7 +4,7 @@
|
||||||
<head>
|
<head>
|
||||||
<title>Agir Statool</title>
|
<title>Agir Statool</title>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta content="April" name="keywords" />
|
<meta content="Redmine" name="keywords" />
|
||||||
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
||||||
<link rel="stylesheet" type="text/css" href="agirstatool.css" />
|
<link rel="stylesheet" type="text/css" href="agirstatool.css" />
|
||||||
<script src="/commons/sorttable.js" />
|
<script src="/commons/sorttable.js" />
|
|
@ -4,7 +4,7 @@
|
||||||
<head>
|
<head>
|
||||||
<title>Agir Statool</title>
|
<title>Agir Statool</title>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta content="April" name="keywords" />
|
<meta content="Redmine" name="keywords" />
|
||||||
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
||||||
<link rel="stylesheet" type="text/css" href="agirstatool.css" />
|
<link rel="stylesheet" type="text/css" href="agirstatool.css" />
|
||||||
<script src="/commons/sorttable.js" />
|
<script src="/commons/sorttable.js" />
|
||||||
|
@ -27,7 +27,7 @@
|
||||||
<span style="margin-left: 25px;"> </span>
|
<span style="margin-left: 25px;"> </span>
|
||||||
<a href="index.xhtml" class="button">Root</a>
|
<a href="index.xhtml" class="button">Root</a>
|
||||||
<a href="admins.xhtml" class="button">Admins</a>
|
<a href="admins.xhtml" class="button">Admins</a>
|
||||||
<a href="chapril.xhtml" class="button">Chapril</a>
|
<a href="project1.xhtml" class="button">Project1</a>
|
||||||
<a href="gdtc.xhtml" class="button">gDTC</a>
|
<a href="gdtc.xhtml" class="button">gDTC</a>
|
||||||
</div>
|
</div>
|
||||||
<div id="3MonthsBox" style="display: none;">
|
<div id="3MonthsBox" style="display: none;">
|
|
@ -4,7 +4,7 @@
|
||||||
<head>
|
<head>
|
||||||
<title>Agir Statool</title>
|
<title>Agir Statool</title>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta content="April" name="keywords" />
|
<meta content="Redmine" name="keywords" />
|
||||||
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
||||||
<link rel="stylesheet" type="text/css" href="agirstatool.css" />
|
<link rel="stylesheet" type="text/css" href="agirstatool.css" />
|
||||||
<script src="/commons/sorttable.js" />
|
<script src="/commons/sorttable.js" />
|
|
@ -4,7 +4,7 @@
|
||||||
<head>
|
<head>
|
||||||
<title>Agir Statool</title>
|
<title>Agir Statool</title>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta content="April" name="keywords" />
|
<meta content="Redmine" name="keywords" />
|
||||||
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
||||||
<link rel="stylesheet" type="text/css" href="agirstatool.css" />
|
<link rel="stylesheet" type="text/css" href="agirstatool.css" />
|
||||||
<script src="/commons/sorttable.js" />
|
<script src="/commons/sorttable.js" />
|
|
@ -4,7 +4,7 @@
|
||||||
<head>
|
<head>
|
||||||
<title>Agir Statool</title>
|
<title>Agir Statool</title>
|
||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta content="April" name="keywords" />
|
<meta content="Redmine" name="keywords" />
|
||||||
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
|
||||||
<link rel="stylesheet" type="text/css" href="agirstatool.css" />
|
<link rel="stylesheet" type="text/css" href="agirstatool.css" />
|
||||||
<script src="/commons/sorttable.js" />
|
<script src="/commons/sorttable.js" />
|
|
@ -17,17 +17,17 @@
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package org.april.agirstatool.demo;
|
package fr.devinsy.agirstatool.demo;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.apache.log4j.BasicConfigurator;
|
import org.apache.log4j.BasicConfigurator;
|
||||||
import org.apache.log4j.PropertyConfigurator;
|
import org.apache.log4j.PropertyConfigurator;
|
||||||
import org.april.agirstatool.core.AgirStatoolException;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolException;
|
||||||
import fr.devinsy.strings.StringList;
|
import fr.devinsy.strings.StringList;
|
||||||
import utils.BuildInformation;
|
import utils.BuildInformation;
|
||||||
|
|
|
@ -16,9 +16,9 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.demo;
|
package fr.devinsy.agirstatool.demo;
|
||||||
|
|
||||||
import org.april.agirstatool.core.AgirStatoolException;
|
import fr.devinsy.agirstatool.core.AgirStatoolException;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Class JugaDemoException.
|
* The Class JugaDemoException.
|
|
@ -36,7 +36,7 @@ public class BuildInformation
|
||||||
{
|
{
|
||||||
private static final Logger logger = LoggerFactory.getLogger(BuildInformation.class);
|
private static final Logger logger = LoggerFactory.getLogger(BuildInformation.class);
|
||||||
|
|
||||||
private static String BUILD_INFORMATION_FILE = "/org/april/agirstatool/build_information.properties";
|
private static String BUILD_INFORMATION_FILE = "/fr/devinsy/agirstatool/build_information.properties";
|
||||||
|
|
||||||
private static class SingletonHolder
|
private static class SingletonHolder
|
||||||
{
|
{
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
* You should have received a copy of the GNU Affero General Public License
|
||||||
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
* along with AgirStatool. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
package org.april.agirstatool.core;
|
package fr.devinsy.agirstatool.core;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
|
@ -32,6 +32,9 @@ import org.junit.AfterClass;
|
||||||
import org.junit.BeforeClass;
|
import org.junit.BeforeClass;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolException;
|
||||||
|
import fr.devinsy.agirstatool.core.AgirStatoolUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The Class JugaTest.
|
* The Class JugaTest.
|
||||||
*
|
*
|
Loading…
Reference in a new issue