Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Translation for IHC reports #576

Merged
merged 1 commit into from
Oct 27, 2023
Merged

Add Translation for IHC reports #576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions frontend/src/components/cytology/CytologyCaseView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,11 @@ function CytologyCaseView() {
<Tag type="blue">
<FormattedMessage id="patient.label.sex" /> :
</Tag>
{pathologySampleInfo.sex === "M" ? "Male" : "Female"}
{pathologySampleInfo.sex === "M" ? (
<FormattedMessage id="patient.male" />
) : (
<FormattedMessage id="patient.female" />
)}
<Tag type="blue">
<FormattedMessage id="patient.label.age" /> :
</Tag>
Expand Down Expand Up @@ -825,7 +829,7 @@ function CytologyCaseView() {

<Column lg={3} md={1} sm={2}>
<FileUploader
style={{ marginTop: "-30px" }}
style={{ marginTop: "-20px" }}
buttonLabel={
<FormattedMessage id="label.button.uploadfile" />
}
Expand Down Expand Up @@ -854,12 +858,12 @@ function CytologyCaseView() {
}}
/>
</Column>
<Column lg={2}>
{
<Column lg={4}>
<h6>{
reportTypes.filter(
(type) => type.id === report.reportType,
)[0]?.value
}
}</h6>
</Column>
<Column lg={2} md={1} sm={2}>
{pathologySampleInfo.reports[index].image && (
Expand Down Expand Up @@ -902,7 +906,7 @@ function CytologyCaseView() {
<FormattedMessage id="button.label.genarateReport" />
</Button>
</Column>
<Column lg={4} md={2} sm={2}/>
<Column lg={2} md={2} sm={2}/>
<Column lg={16} md={8} sm={4}>
<div> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</div>
</Column>
Expand Down
46 changes: 23 additions & 23 deletions frontend/src/components/immunohistochemistry/ImmunohistochemistryCaseView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ function ImmunohistochemistryCaseView() {
/>
</Column>
<Column lg={3} md={8} sm={4}>
% of cell show nuclear staining with
<FormattedMessage id="immunohistochemistry.label.cellPercent" />
</Column>
<Column lg={2} md={8} sm={4}>
<TextInput
Expand All @@ -255,7 +255,7 @@ function ImmunohistochemistryCaseView() {
/>
</Column>
<Column lg={3} md={8} sm={4}>
intensity . Allred score
<FormattedMessage id="immunohistochemistry.label.cellIntensity" />
</Column>
<Column lg={2} md={8} sm={4}>
<TextInput
Expand All @@ -274,7 +274,7 @@ function ImmunohistochemistryCaseView() {
/>
</Column>
<Column lg={2} md={8} sm={4}>
out of 8
<FormattedMessage id="immunohistochemistry.label.outOf8" />
</Column>

<Column lg={16} md={8} sm={4}>
Expand All @@ -300,7 +300,7 @@ function ImmunohistochemistryCaseView() {
/>
</Column>
<Column lg={3} md={8} sm={4}>
% of cell show nuclear staining with
<FormattedMessage id="immunohistochemistry.label.cellPercent" />
</Column>
<Column lg={2} md={8} sm={4}>
<TextInput
Expand All @@ -319,7 +319,7 @@ function ImmunohistochemistryCaseView() {
/>
</Column>
<Column lg={3} md={8} sm={4}>
intensity . Allred score
<FormattedMessage id="immunohistochemistry.label.cellIntensity" />
</Column>
<Column lg={2} md={8} sm={4}>
<TextInput
Expand All @@ -338,15 +338,15 @@ function ImmunohistochemistryCaseView() {
/>
</Column>
<Column lg={2} md={8} sm={4}>
out of 8
<FormattedMessage id="immunohistochemistry.label.outOf8" />
</Column>

<Column lg={16} md={8} sm={4}>
<div> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</div>
</Column>

<Column lg={3} md={8} sm={4}>
MiB 1(ki-67) (Proliferative Index)
<FormattedMessage id="immunohistochemistry.label.mibName" />
</Column>
<Column lg={8} md={8} sm={4}>
<TextInput
Expand All @@ -365,14 +365,14 @@ function ImmunohistochemistryCaseView() {
/>
</Column>
<Column lg={5} md={8} sm={4}>
of tumor cells positive (cut of 20%)
<FormattedMessage id="immunohistochemistry.label.tumorCells" />
</Column>
<Column lg={16} md={8} sm={4}>
<div> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</div>
</Column>

<Column lg={3} md={8} sm={4}>
CerbB2/HER 2 staining pattern
<FormattedMessage id="immunohistochemistry.label.her2Pattern" />
</Column>
<Column lg={13} md={8} sm={4}>
<TextArea
Expand All @@ -396,7 +396,7 @@ function ImmunohistochemistryCaseView() {
</Column>

<Column lg={4} md={8} sm={4}>
HER 2 protein assesment is
<FormattedMessage id="immunohistochemistry.label.her2Assesment" />
</Column>
<Column lg={4} md={8} sm={4}>
<TextInput
Expand All @@ -415,7 +415,7 @@ function ImmunohistochemistryCaseView() {
/>
</Column>
<Column lg={4} md={8} sm={4}>
with a score of
<FormattedMessage id="immunohistochemistry.label.her2ScoreOf" />
</Column>
<Column lg={4} md={8} sm={4}>
<TextInput
Expand All @@ -437,7 +437,7 @@ function ImmunohistochemistryCaseView() {
<div> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</div>
</Column>
<Column lg={3} md={8} sm={4}>
Histological Diagnosis
<FormattedMessage id="immunohistochemistry.label.historicalDiagnosis" />
</Column>
<Column lg={13} md={8} sm={4}>
<TextArea
Expand All @@ -460,7 +460,7 @@ function ImmunohistochemistryCaseView() {
<div> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</div>
</Column>
<Column lg={3} md={8} sm={4}>
Molecular SubType
<FormattedMessage id="immunohistochemistry.label.molecularType" />
</Column>
<Column lg={13} md={8} sm={4}>
<TextInput
Expand Down Expand Up @@ -488,7 +488,7 @@ function ImmunohistochemistryCaseView() {
<Column lg={16} md={8} sm={4}>
<Grid fullWidth={true} className="gridBoundary">
<Column lg={3} md={8} sm={4}>
Number of Cancer nuclei
<FormattedMessage id="immunohistochemistry.label.numberOfCancer" />
</Column>
<Column lg={5} md={8} sm={4}>
<TextInput
Expand All @@ -510,7 +510,7 @@ function ImmunohistochemistryCaseView() {
<div> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</div>
</Column>
<Column lg={3} md={8} sm={4}>
Average HER2 per nucleus
<FormattedMessage id="immunohistochemistry.label.averageHer2" />
</Column>
<Column lg={5} md={8} sm={4}>
<TextInput
Expand Down Expand Up @@ -543,7 +543,7 @@ function ImmunohistochemistryCaseView() {
<div> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</div>
</Column>
<Column lg={3} md={8} sm={4}>
Average Chromozome 17 Sinals per nucleus
<FormattedMessage id="immunohistochemistry.label.averageChrom" />
</Column>
<Column lg={5} md={8} sm={4}>
<TextInput
Expand Down Expand Up @@ -576,7 +576,7 @@ function ImmunohistochemistryCaseView() {
<div> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</div>
</Column>
<Column lg={3} md={8} sm={4}>
Ratio of Her2/neu Signals to Chromozome 17
<FormattedMessage id="immunohistochemistry.label.ihcRatio" />
</Column>
<Column lg={5} md={8} sm={4}>
<TextInput
Expand All @@ -592,7 +592,7 @@ function ImmunohistochemistryCaseView() {
<div> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</div>
</Column>
<Column lg={3} md={8} sm={4}>
IHC (Cerb2 Scoer)
<FormattedMessage id="immunohistochemistry.label.ihcScore" />
</Column>
<Column lg={5} md={8} sm={4}>
<TextInput
Expand All @@ -614,7 +614,7 @@ function ImmunohistochemistryCaseView() {
<Column lg={16} md={8} sm={4}>
<Grid fullWidth={true} className="gridBoundary">
<Column lg={3} md={8} sm={4}>
Conlusion
<FormattedMessage id="pathology.label.conclusion" />
</Column>
<Column lg={13} md={8} sm={4}>
<TextArea
Expand Down Expand Up @@ -804,8 +804,8 @@ function ImmunohistochemistryCaseView() {
<FormattedMessage id="patient.label.sex" />:
</Tag>
{immunohistochemistrySampleInfo.sex === "M"
? "Male"
: "Female"}
? <FormattedMessage id="patient.male" />
: <FormattedMessage id="patient.female" />}
<Tag type="blue">
<FormattedMessage id="patient.label.age" /> :
</Tag>
Expand Down Expand Up @@ -1034,7 +1034,7 @@ function ImmunohistochemistryCaseView() {

<Column lg={2} md={1} sm={2}>
<FileUploader
style={{ marginTop: "-30px" }}
style={{ marginTop: "-20px" }}
buttonLabel={
<FormattedMessage id="label.button.uploadfile" />
}
Expand Down Expand Up @@ -1142,7 +1142,7 @@ function ImmunohistochemistryCaseView() {
toggled={reportParams[index]?.toggled}
aria-label="toggle button"
id={index + "_toggle"}
labelText="Toggle report param"
labelText={intl.formatMessage({ id: "button.label.showHidePram" })}
onToggle={(e) => toggleReportParam(e, index)}
/>
</Column>
Expand Down
10 changes: 7 additions & 3 deletions frontend/src/components/pathology/PathologyCaseView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,11 @@ function PathologyCaseView() {
<Tag type="blue">
<FormattedMessage id="patient.label.sex" /> :
</Tag>
{pathologySampleInfo.sex === "M" ? "Male" : "Female"}
{pathologySampleInfo.sex === "M" ? (
<FormattedMessage id="patient.male" />
) : (
<FormattedMessage id="patient.female" />
)}
<Tag type="blue">
<FormattedMessage id="patient.label.age" /> :
</Tag>
Expand Down Expand Up @@ -525,7 +529,7 @@ function PathologyCaseView() {

<Column lg={3} md={1} sm={2}>
<FileUploader
style={{ marginTop: "-30px" }}
style={{ marginTop: "-20px" }}
buttonLabel={
<FormattedMessage id="label.button.uploadfile" />
}
Expand Down Expand Up @@ -555,7 +559,7 @@ function PathologyCaseView() {
/>
</Column>
<Column lg={2}>
<FormattedMessage id="pathology.label.report" />
<h6><FormattedMessage id="pathology.label.report" /></h6>
</Column>
<Column lg={2} md={1} sm={2}>
{pathologySampleInfo.reports[index].image && (
Expand Down
19 changes: 17 additions & 2 deletions frontend/src/languages/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,21 @@
"pathology.label.block.number": "Block number",
"pathology.label.block.add.number": "Number of Blocks to add",
"pathology.label.slide.add.number": "Number of Slides to add",
"button.label.genarateReport" : "Generate Report"

"button.label.genarateReport" : "Generate Report",
"button.label.showHidePram" : "Show/Hide Report Parameter" ,
"immunohistochemistry.label.numberOfCancer" : "Number of Cancer nuclei",
"immunohistochemistry.label.averageHer2" : "Average HER2 per nucleus" ,
"immunohistochemistry.label.averageChrom" : "Average Chromozome 17 Sinals per nucleus",
"immunohistochemistry.label.ihcRatio" : "Ratio of Her2/neu Signals to Chromozome 17",
"immunohistochemistry.label.ihcScore" : "IHC (Cerb2 Score)" ,
"immunohistochemistry.label.her2Pattern" : "CerbB2/HER 2 staining pattern" ,
"immunohistochemistry.label.historicalDiagnosis" : "Histological Diagnosis",
"immunohistochemistry.label.molecularType" : " Molecular SubType" ,
"immunohistochemistry.label.cellPercent" : "% of cell show nuclear staining with",
"immunohistochemistry.label.cellIntensity" : "intensity . Allred score",
"immunohistochemistry.label.outOf8" : "out of 8" ,
"immunohistochemistry.label.mibName" : " MiB 1(ki-67) (Proliferative Index): ",
"immunohistochemistry.label.tumorCells" :"of tumor cells positive (cut of 20%)",
"immunohistochemistry.label.her2Assesment" :"HER 2 protein assesment is" ,
"immunohistochemistry.label.her2ScoreOf" :"with a Score of"
}
18 changes: 17 additions & 1 deletion frontend/src/languages/fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,21 @@
"label.button.remove.block": "Supprimer le Bloc",
"label.button.remove.report": "Supprimer le Rapport",
"pathology.label.block.number": "Numéro du Bloc" ,
"button.label.genarateReport" : "Générer un rapport"
"button.label.genarateReport" : "Générer un rapport",
"button.label.showHidePram" : "Afficher/Masquer les paramètres du rapport",
"immunohistochemistry.label.numberOfCancer" : "Nombre de noyaux cancéreux",
"immunohistochemistry.label.averageHer2" : "Moyenne de HER2 par noyau",
"immunohistochemistry.label.averageChrom" : "Moyenne des signaux Chromosome 17 par noyau",
"immunohistochemistry.label.ihcRatio" : "Ratio des signaux Her2/neu par rapport au Chromosome 17",
"immunohistochemistry.label.ihcScore" : "Score IHC (Cerb2)",
"immunohistochemistry.label.her2Pattern" : "Motif de coloration CerbB2/HER 2",
"immunohistochemistry.label.historicalDiagnosis" : "Diagnostic histologique",
"immunohistochemistry.label.molecularType" : "Sous-type moléculaire" ,
"immunohistochemistry.label.cellPercent" : "% des cellules présentent une coloration nucléaire avec",
"immunohistochemistry.label.cellIntensity" : "d'intensité. Score Allred",
"immunohistochemistry.label.outOf8" : "sur 8" ,
"immunohistochemistry.label.mibName" : "MiB 1 (ki-67) (Indice de prolifération) :",
"immunohistochemistry.label.tumorCells" :"des cellules tumorales sont positives (seuil de 20 %)",
"immunohistochemistry.label.her2Assesment" :"L'évaluation de la protéine HER2 est de" ,
"immunohistochemistry.label.her2ScoreOf" :"Avec un score de"
}
1 change: 1 addition & 0 deletions src/main/java/org/openelisglobal/program/service/ImmunohistochemistryDisplayServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ public ImmunohistochemistryCaseViewDisplayItem convertToCaseDisplayItem(Integer
displayItem.setRequests(pathologySample.getRequests().stream().filter(e -> e.getType() == RequestType.DICTIONARY)
.map(e -> new IdValuePair(e.getValue(), dictionaryService.get(e.getValue()).getLocalizedName()))
.collect(Collectors.toList()));
displayItem.setSex(patient.getGender());

}
return displayItem;
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/openelisglobal/program/service/PathologyDisplayServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ public PathologyCaseViewDisplayItem convertToCaseDisplayItem(Integer pathologySa
}
displayItem.setRequester(sampleItem.getProviderLastName() +" "+ sampleItem.getProviderFirstName());
displayItem.setAge(DateUtil.getCurrentAgeForDate(patient.getBirthDate() ,DateUtil.getNowAsTimestamp()));
displayItem.setSex(patient.getGender());
return displayItem;
}

Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/openelisglobal/program/service/cytology/CytologyDisplayServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ public CytologyCaseViewDisplayItem convertToCaseDisplayItem(Integer cytologySamp
}
displayItem.setRequester(sampleItem.getProviderLastName() + " " + sampleItem.getProviderFirstName());
displayItem.setAge(DateUtil.getCurrentAgeForDate(patient.getBirthDate(), DateUtil.getNowAsTimestamp()));
displayItem.setSex(patient.getGender());
return displayItem;
}

Expand Down
10 changes: 10 additions & 0 deletions src/main/resources/languages/message_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7845,6 +7845,16 @@ dualInSitu.label.amp = Amplification
dualInSitu.label.noAmp = No Amplification
dualInSitu.label.comment : Comment : This essay will not detect other abnomalities that may have clinical siginificance. This result must be evaluated in conjuction with other Clinical \
and other Laboratory parameters .The test is used for Diagnostic purposes only.
immunohistochemistry.label.her2Pattern = CerbB2/HER 2 staining pattern
immunohistochemistry.label.historicalDiagnosis = Histological Diagnosis
immunohistochemistry.label.molecularType = Molecular SubType
immunohistochemistry.label.cellPercent = % of cell show nuclear staining with
immunohistochemistry.label.cellIntensity = intensity . Allred score
immunohistochemistry.label.outOf8 = out of 8
immunohistochemistry.label.mibName = MiB 1(ki-67) (Proliferative Index):
immunohistochemistry.label.tumorCells = of tumor cells positive (cut of 20%)
immunohistochemistry.label.her2Assesment = HER 2 protein assessment is
immunohistochemistry.label.her2ScoreOf = with a Score of



Expand Down
10 changes: 10 additions & 0 deletions src/main/resources/languages/message_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7343,4 +7343,14 @@ dualInSitu.label.interpretation = Interprétation
dualInSitu.label.amp = Amplification
dualInSitu.label.noAmp = Pas d'amplification
dualInSitu.label.comment : Commentaire : Ce test ne détectera pas d'autres anomalies qui pourraient avoir une signification clinique. Ces résultats doivent être évalués en conjonction avec d'autres paramètres cliniques et de laboratoire. Le test est utilisé à des fins diagnostiques uniquement.
immunohistochemistry.label.her2Pattern = Motif de coloration CerbB2/HER 2
immunohistochemistry.label.historicalDiagnosis = Diagnostic histologique
immunohistochemistry.label.molecularType = Sous-type moléculaire
immunohistochemistry.label.cellPercent = % des cellules présentent une coloration nucléaire avec
immunohistochemistry.label.cellIntensity = d'intensité. Score Allred
immunohistochemistry.label.outOf8 = sur 8
immunohistochemistry.label.mibName = MiB 1 (ki-67) (Indice de prolifération) :
immunohistochemistry.label.tumorCells = des cellules tumorales sont positives (seuil de 20 %)
immunohistochemistry.label.her2Assesment = L'évaluation de la protéine HER2 est de
immunohistochemistry.label.her2ScoreOf = Avec un score de

Binary file modified src/main/resources/reports/BreastCancerHormoneReceptorReport.jasper
View file
Open in desktop
Binary file not shown.
Loading
Loading