Commit 98d390dd authored by pfreon's avatar pfreon
Browse files

Minor changes on html issues

Minor changes on html issues.
File RapportHtml.java  minor changes related to variable bEnable[]
File WriteHtml.java comments.
parent b5f0b6b6
/**
* Titre : Climprod<p>
*
* Constitute un rapport de l'historique des données, graphiques et tableau de résultats
* et celui des questions/réponses en lien avec WriteHtml.java.
*/
package fr.ird.climprod;
......@@ -99,9 +100,9 @@ public class RapportHtml extends JDialog {
bEnable[9] = bEnable[4];
bEnable[10] = bEnable[6];
// to enable questions and answers
//bEnable[11] = bEnable[6];
bEnable[11] = bEnable[6]; // Modif 2020 (enlevé //).
//bEnable[11] = (Global.questionDic.size() != 0);
bEnable[11] = true;
// bEnable[11] = true; // Modif 2020 (rajouté //).
// to create index.html
bEnable[12] = bEnable[0];
for (int i = 0; i < chkInclude.length; i++) {
......@@ -167,7 +168,7 @@ public class RapportHtml extends JDialog {
}
/**
*
*Titres des onglets et des fichiers html et of
*/
@SuppressWarnings("unchecked")
void cmdOk_actionPerformed(ActionEvent e) {
......@@ -320,10 +321,11 @@ public class RapportHtml extends JDialog {
htmlText[10] = htmlText[10] + makeValidationTable();
htmlText[10] = htmlText[10] + "\n </CENTER>\n</BODY>\n</HTML>";
}
if (bEnable[11]) {
if (bEnable[11]) {
htmlText[11] = htlmEntete.replace("HREF =\""+htmlFile[11]+"\"","HREF =\""+htmlFile[11]+"\" style=\"font-weight:bold;font-size:16px;color:red;\"") + "\n\n ";
htmlText[11] = htmlText[11] + "<H4> Questions, answers &amp; warning</H4>\n <CENTER>\n";
htmlText[11] = htmlText[11] + makeQuestionsAnswers();
System.out.println("Flag if (bEnable[11])dans RapportHtml.java ligne 328, makeQuestionsAnswers()= " + makeQuestionsAnswers()); // Modif. 2020.
htmlText[11] = htmlText[11] + "\n </CENTER>\n</BODY>\n</HTML>";
}
if (bEnable[12]) {
......@@ -382,9 +384,13 @@ public class RapportHtml extends JDialog {
expI.write();
}
private String makeQuestionsAnswers(){
/*
*Création contenu onglet Questions & Réponses. Commentaire 2020
*/
private String makeQuestionsAnswers(){
String resultHTML = "<ul style='text-align:left;'>";
System.out.println("Flag private String makeQuestionsAnswers() dans RapportHtml.java ligne 393, resultHTML = " + resultHTML); // Modif. 2020
// ugly way to make tings ordered
for (int i = 0; i < 200; i++){
if (Global.questionDic.containsKey(i)){
......@@ -392,6 +398,7 @@ public class RapportHtml extends JDialog {
resultHTML += Global.questionDic.get(i).replace('²','2')+" ";
resultHTML += "<b style='color:blue;'>"+Global.answerDic.get(i)+"</b>";
if (Global.warningDic.containsKey(i)){
System.out.println("Flag if (Global.warningDic.containsKey(i)) dans RapportHtml.java ligne 400, i = " + i + " Global.warningDic.containsKey(i) = " + Global.warningDic.containsKey(i)); // Modif. 2020
if (!Global.warningDic.get(i).equals("")){
resultHTML += "<i style='color:red;'>("+Global.warningDic.get(i)+")</i>";
}
......
......@@ -6,6 +6,7 @@
* Soci�t� : <p>
* @author
* @version 1.0
* Formate un dossier html pour conserver l'historique des données, résultats, graphiques et questions/réponses.
*/
package fr.ird.climprod;
import java.util.Hashtable;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment