Use makeRef2 for ConceptInstance in GlassBR

JacquesCarette · Nov 18, 2018 · 2a15246 · 2a15246 · JacquesCarette · Nov 18, 2018
1 parent ec7a18a
commit 2a15246
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/code/drasil-example/Drasil/GlassBR/Body.hs b/code/drasil-example/Drasil/GlassBR/Body.hs
@@ -525,13 +525,13 @@ traceMatsAndGraphsDataCons  = ["Data Constraints"]
 traceMatsAndGraphsDataConsRef = [makeRefS SRS.datConLabel]
 
 traceMatsAndGraphsFuncReq = ["R1", "R2", "R3", "R4", "R5", "R6"]
-traceMatsAndGraphsFuncReqRef = map makeRefS funcReqs
+traceMatsAndGraphsFuncReqRef = map makeRef2S funcReqs
 
 traceMatsAndGraphsA = ["A1", "A2", "A3", "A4", "A5", "A6", "A7", "A8"]
 traceMatsAndGraphsARef = map makeRefS assumptions
 
 traceMatsAndGraphsLC = ["LC1", "LC2", "LC3", "LC4", "LC5"]
-traceMatsAndGraphsLCRef = map makeRefS likelyChgs
+traceMatsAndGraphsLCRef = map makeRef2S likelyChgs
 
 traceMatsAndGraphsRowT1 :: [String]
 traceMatsAndGraphsRowT1 = traceMatsAndGraphsT ++ traceMatsAndGraphsIM ++ traceMatsAndGraphsDD

diff --git a/code/drasil-example/Drasil/GlassBR/Requirements.hs b/code/drasil-example/Drasil/GlassBR/Requirements.hs
@@ -78,7 +78,7 @@ inputGlassPropsTable = llcc (mkLabelSame "InputGlassPropsReqInputs" Tab) $
   (mkTable
   [ch,
    at_start, U.toSentence] requiredInputs)
-  (S "Required Inputs following" +:+ makeRefS inputGlassProps) True
+  (S "Required Inputs following" +:+ makeRef2S inputGlassProps) True
   where
     requiredInputs :: [QuantityDict]
     requiredInputs = (map qw [plate_len, plate_width, char_weight])
@@ -108,8 +108,8 @@ checkInputWithDataConsDesc = foldlSent [S "The", phrase system, S "shall check t
   S "an", phrase errMsg, S "is displayed" `andThe` plural calculation, S "stop"]
 
 outputValsAndKnownQuantsDesc = foldlSent [titleize output_, S "the", plural inQty,
-  S "from", makeRefS inputGlassProps `andThe` S "known", plural quantity,
-  S "from", makeRefS sysSetValsFollowingAssumps]
+  S "from", makeRef2S inputGlassProps `andThe` S "known", plural quantity,
+  S "from", makeRef2S sysSetValsFollowingAssumps]
 
 checkGlassSafetyDesc cmd = foldlSent_ [S "If", (ch is_safePb), S "∧", (ch is_safeLR),
   sParen (S "from" +:+ (makeRefS pbIsSafe)

diff --git a/code/drasil-printers/Language/Drasil/Printing/Import.hs b/code/drasil-printers/Language/Drasil/Printing/Import.hs
@@ -271,7 +271,7 @@ spec _ (P s)           = P.E $ symbol s
 spec sm (Ch s)         = P.E $ symbol $ lookupC sm s 
 spec sm (Ref (Reference t r sn))   = P.Ref t r (spec sm (S . getStringSN $ resolveSN sn $
   lookupDeferredSN sm)) sn --FIXME: sn passed in twice?
-spec sm (Ref2 (Reference2 rp ra sn)) = P.Ref2 "FIXME" "A" ra $ spec sm $ renderShortName sm rp sn
+spec sm (Ref2 (Reference2 rp ra sn)) = P.Ref2 "FIXME" "FIXME" ra $ spec sm $ renderShortName sm rp sn
 spec sm (Quote q)      = P.Quote $ spec sm q
 spec _  EmptyS         = P.EmptyS
 spec sm (E e)          = P.E $ expr e sm

diff --git a/code/stable/swhs/SRS/SWHS_SRS.tex b/code/stable/swhs/SRS/SWHS_SRS.tex
@@ -636,9 +636,9 @@ \subsubsection{Data Definitions}
               \item{${T_{P}}$ is the temperature of the phase change material (${}^{\circ}$C)}
               \end{symbDescription}
 \\ \midrule \\
-Notes & A\ref{A:Constant-Water-Temp-Across-Tank}
-        A\ref{A:Temp-PCM-Constant-Across-Volume}
-        A\ref{A:Law-Convective-Cooling-Water-PCM}
+Notes & \hyperref[A:Constant-Water-Temp-Across-Tank]{A: Constant-Water-Temp-Across-Tank}
+        \hyperref[A:Temp-PCM-Constant-Across-Volume]{A: Temp-PCM-Constant-Across-Volume}
+        \hyperref[A:Law-Convective-Cooling-Water-PCM]{A: Law-Convective-Cooling-Water-PCM}
 \\ \midrule \\
 Source & \cite{koothoor2013}
 \\ \midrule \\