various

nuuuwan · Jul 30, 2024 · 1f83558 · 1f83558
1 parent 1886b80
commit 1f83558
Show file tree

Hide file tree

Showing 12 changed files with 320 additions and 549 deletions.
diff --git a/.eslintcache b/.eslintcache
diff --git a/public/images/parties/logo_Ind.png b/public/images/parties/logo_Ind.png
diff --git a/src/nonview/constants/VERSION.js b/src/nonview/constants/VERSION.js
@@ -1,5 +1,5 @@
 // Auto-generated by javascript_version.py
-export const DATETIME_STR = "2024-07-30 18:04:50";
+export const DATETIME_STR = "2024-07-30 19:47:00";
 export const VERSION_DATETIME = new Date(DATETIME_STR);
 
 const VERSION = { DATETIME_STR, VERSION_DATETIME };

diff --git a/src/nonview/core/Candidate.js b/src/nonview/core/Candidate.js
@@ -1,4 +1,5 @@
 import IDX from "../../nonview/base/IDX";
+import { CANDIDATE_D_LIST } from "../../nonview/data/CANDIDATE_D_LIST";
 
 export default class Candidate {
   constructor(id, firstName, lastName, twtrHandle, imgFile, party) {
@@ -30,100 +31,6 @@ export default class Candidate {
   }
 }
 
-const CANDIDATE_D_LIST = [
-  {
-    id: "RW",
-    firstName: "Ranil",
-    lastName: "Wickramasinghe",
-    twtrHandle: "RW_UNP",
-    imgFile: "1244.jpg",
-    party: "UNP",
-  },
-  {
-    id: "SP",
-    firstName: "Sajith",
-    lastName: "Premadasa",
-    twtrHandle: "SajithPremadasa",
-    imgFile: "140.jpg",
-    party: "SJB",
-  },
-  {
-    id: "SF",
-    firstName: "Sarath",
-    lastName: "Fonseka",
-    twtrHandle: "GeneralFonseka",
-    imgFile: "3135.jpg",
-    party: "Ind",
-  },
-  {
-    id: "MAS",
-    firstName: "Mathiaparanan Abraham",
-    lastName: "Sumanthiran",
-    twtrHandle: "MASumanthiran",
-    imgFile: "3194.jpg",
-    party: "ITAK",
-  },
-
-  {
-    id: "AKD",
-    firstName: "Anura Kumara",
-    lastName: "Disanayake",
-    twtrHandle: "AnuraDisanayake",
-    imgFile: "112.jpg",
-    party: "NPP",
-  },
-
-  // Added 2024
-  {
-    id: "WR",
-    firstName: "Wijeyadasa",
-    lastName: "Rajapakshe",
-    twtrHandle: "WijeRajapakshe",
-    imgFile: "1521.jpg",
-    party: "SLFP",
-  },
-  {
-    id: "JR",
-    firstName: "Janaka",
-    lastName: "Ratnayake",
-    twtrHandle: "",
-    imgFile: "JR.jpg",
-    party: "Ind",
-  },
-  {
-    id: "SK",
-    firstName: "Sarath",
-    lastName: "Keerthirathna",
-    twtrHandle: "SK.jpg",
-    imgFile: "",
-    party: "Ind",
-  },
-  {
-    id: "OH",
-    firstName: "Oshala",
-    lastName: "Herath",
-    twtrHandle: "@OshalaHerath",
-    imgFile: "",
-    party: "NIF",
-  },
-  {
-    id: "ASPL",
-    firstName: "ASP",
-    lastName: "Liyanage",
-    twtrHandle: "",
-    imgFile: "ASPL.png",
-    party: "SLLP",
-  },
-  {
-    id: "NB",
-    firstName: "Nuwan",
-    lastName: "Bopage",
-    twtrHandle: "",
-    imgFile: "NB.png",
-    party: "PSA",
-  },
-];
-
 export const CANDIDATE_LIST = CANDIDATE_D_LIST.map((d) =>
   Candidate.fromDict(d)
 );

diff --git a/src/nonview/core/GroundTruth.js b/src/nonview/core/GroundTruth.js
@@ -1,8 +1,8 @@
-import { ATTR_IDX_NUUUWAN } from "../../nonview/core/GroundTruthRawData";
+import { CRITERION_TO_CANDIDATE_TO_SCORE } from "../../nonview/data/CRITERION_TO_CANDIDATE_TO_SCORE";
 
 import MathX from "../../nonview/base/MathX";
 const ATTR_IDX_IDX = Object({
-  "@nuuuwan": ATTR_IDX_NUUUWAN,
+  "@nuuuwan": CRITERION_TO_CANDIDATE_TO_SCORE,
 });
 
 export default class GroundTruth {

diff --git a/src/nonview/core/GroundTruthRawData.js b/src/nonview/core/GroundTruthRawData.js
diff --git a/src/nonview/core/index.js b/src/nonview/core/index.js
@@ -2,17 +2,8 @@
 import Candidate from "./Candidate";
 import Criterion from "./Criterion";
 import GroundTruth from "./GroundTruth";
-import GroundTruthRawData from "./GroundTruthRawData";
 import Party from "./Party";
 import Version from "./Version";
 import Weight from "./Weight";
 
-export {
-  Candidate,
-  Criterion,
-  GroundTruth,
-  GroundTruthRawData,
-  Party,
-  Version,
-  Weight,
-};
+export { Candidate, Criterion, GroundTruth, Party, Version, Weight };