Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Merge pull request #374 from zanata/rhbz998298
Browse files Browse the repository at this point in the history 
Fix statistic remaining hours to use wordstats
  • Loading branch information
@carlosmunoz
carlosmunoz committed Feb 13, 2014
2 parents f933e19 + 2f59779 commit d483df9
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 69 deletions.
73 changes: 17 additions & 56 deletions zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
View file
Expand Up @@ -20,8 +20,6 @@
*/
package org.zanata.action;

import static org.zanata.rest.dto.stats.TranslationStatistics.StatUnit.WORD;

import java.io.File;
import java.io.InputStream;
import java.io.Serializable;
Expand All @@ -34,16 +32,11 @@
import java.util.List;
import java.util.Map;
import java.util.Set;

import javax.annotation.Nullable;
import javax.faces.context.FacesContext;
import javax.validation.ConstraintViolationException;
import javax.ws.rs.WebApplicationException;

import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;

import org.jboss.seam.ScopeType;
import org.jboss.seam.annotations.In;
import org.jboss.seam.annotations.Name;
Expand Down Expand Up @@ -90,11 +83,15 @@
import org.zanata.service.TranslationService;
import org.zanata.util.StringUtil;
import org.zanata.util.ZanataMessages;

import com.google.common.base.Function;
import com.google.common.base.Optional;
import com.google.common.base.Strings;

import lombok.Getter;
import lombok.Setter;
import lombok.extern.slf4j.Slf4j;
import static org.zanata.rest.dto.stats.TranslationStatistics.StatUnit.WORD;

@Name("projectIterationFilesAction")
@Scope(ScopeType.PAGE)
@CachedMethods
Expand All @@ -103,10 +100,16 @@ public class ProjectIterationFilesAction implements Serializable {

private static final long serialVersionUID = 1L;

@Getter
@Setter
private String projectSlug;

@Getter
@Setter
private String iterationSlug;

@Getter
@Setter
private String localeId;

@In
Expand Down Expand Up @@ -148,8 +151,12 @@ public class ProjectIterationFilesAction implements Serializable {
@In
private ZanataMessages zanataMessages;

@Getter
@Setter
private List<HDocument> iterationDocuments;

@Getter
@Setter
private String documentNameFilter;

private TranslationFileUploadHelper translationFileUpload;
Expand All @@ -158,6 +165,8 @@ public class ProjectIterationFilesAction implements Serializable {

private HProjectIteration projectIteration;

@Getter
@Setter
private StatUnit statsOption = WORD;

private Map<String, TranslationStatistics> statisticMap;
Expand Down Expand Up @@ -449,38 +458,6 @@ public boolean isDocumentRemovalAllowed() {
return this.isDocumentUploadAllowed();
}

public List<HDocument> getIterationDocuments() {
return iterationDocuments;
}

public void setIterationDocuments(List<HDocument> iterationDocuments) {
this.iterationDocuments = iterationDocuments;
}

public String getProjectSlug() {
return projectSlug;
}

public void setProjectSlug(String projectSlug) {
this.projectSlug = projectSlug;
}

public String getIterationSlug() {
return iterationSlug;
}

public void setIterationSlug(String iterationSlug) {
this.iterationSlug = iterationSlug;
}

public String getLocaleId() {
return localeId;
}

public void setLocaleId(String localeId) {
this.localeId = localeId;
}

public boolean isKnownProjectType() {
ProjectType type =
projectIterationDAO.getBySlug(projectSlug, iterationSlug)
Expand Down Expand Up @@ -516,14 +493,6 @@ public String extensionOf(String docPath, String docName) {
iterationSlug, docPath, docName);
}

public String getDocumentNameFilter() {
return documentNameFilter;
}

public void setDocumentNameFilter(String documentNameFilter) {
this.documentNameFilter = documentNameFilter;
}

public TranslationFileUploadHelper getTranslationFileUpload() {
return translationFileUpload;
}
Expand All @@ -540,14 +509,6 @@ public HProjectIteration getProjectIteration() {
return this.projectIteration;
}

public StatUnit getStatsOption() {
return statsOption;
}

public void setStatsOption(StatUnit statsOption) {
this.statsOption = statsOption;
}

public boolean isUserAllowedToTranslate() {
return isIterationActive()
&& identity != null
Expand Down
27 changes: 14 additions & 13 deletions zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
View file
Expand Up @@ -127,8 +127,8 @@ public ContainerTranslationStatistics getStatistics(String projectSlug,
.generatePathForProjectIteration(iteration)), "statSource",
"PROJ_ITER"));
long iterationTotalMssgs =
projectIterationDAO
.getTotalMessageCountForIteration(iteration.getId());
projectIterationDAO.getTotalMessageCountForIteration(iteration
.getId());
long iterationTotalWords =
projectIterationDAO.getTotalWordCountForIteration(iteration
.getId());
Expand Down Expand Up @@ -252,6 +252,17 @@ public ContainerTranslationStatistics getStatistics(String projectSlug,
transUnitStats =
stats.getStats(locale.getId(), StatUnit.MESSAGE);
}

// word stats
TranslationStatistics wordsStats;
if (stats == null) {
wordsStats =
new TranslationStatistics(new TransUnitWords(0, 0,
(int) docTotalWords), locale.getId());
} else {
wordsStats = stats.getStats(locale.getId(), StatUnit.WORD);
}

DocumentStatus docStat =
translationStateCacheImpl.getDocumentStatus(
document.getId(), locale);
Expand All @@ -264,20 +275,11 @@ public ContainerTranslationStatistics getStatistics(String projectSlug,
docStat.getLastTranslatedBy()));

transUnitStats.setRemainingHours(StatisticsUtil
.getRemainingHours(transUnitStats));
.getRemainingHours(wordsStats));
docStats.addStats(transUnitStats);

// word level stats
if (includeWordStats) {
TranslationStatistics wordsStats;
if (stats == null) {
wordsStats =
new TranslationStatistics(new TransUnitWords(0, 0,
(int) docTotalWords), locale.getId());
} else {
wordsStats = stats.getStats(locale.getId(), StatUnit.WORD);
}

wordsStats.setLastTranslatedBy(docStat.getLastTranslatedBy());
wordsStats.setLastTranslatedDate(docStat
.getLastTranslatedDate());
Expand Down Expand Up @@ -338,7 +340,6 @@ public ContainerTranslationStatistics getDocStatistics(Long documentId,
TranslationStatistics wordStatistics =
result.getStats(localeId.getId(), StatUnit.WORD);


TranslationStatistics msgStatistics =
result.getStats(localeId.getId(), StatUnit.MESSAGE);
msgStatistics.setRemainingHours(wordStatistics.getRemainingHours());
Expand Down

0 comments on commit d483df9

Please sign in to comment.