Skip to content

Commit

Permalink
FIX table of contents
Browse files Browse the repository at this point in the history
  • Loading branch information
@frasese
frasese committed Oct 3, 2023
1 parent 9c470e9 commit 148f18c
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 35 deletions.
7 changes: 7 additions & 0 deletions library/src/morpheus-master/sass/modules/tool/samigo/_samigo.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,13 @@
.time-bar-button-container{
margin-bottom: 1em;
}

.tableofcontents {
label {
padding-left: 5px;
cursor:pointer;
}
}
}

.#{$namespace}sakai-samigo, .#{$namespace}toolBody--sakai-samigo {
Expand Down
3 changes: 2 additions & 1 deletion ...o/samigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -636,4 +636,5 @@ partTimer_info_end=The time allowed for this part has expired.
questionTimer_title=Time remaining for this question
questionTimer_info_start=Timed question. Once you click \"Start\" you will have <b>{0}</b> to complete this question. It will be <b>submitted at that time</b>, regardless of whether you have answered it.
questionTimer_info_start_deadline=Timed question. Once you click \"Start\" you will have <b>{0} or until {1} whichever is shorter</b> to complete this question. It will be <b>submitted at that time</b>, regardless of whether you have answered it.
questionTimer_info_end=The time allowed for this question has expired.
questionTimer_info_end=The time allowed for this question has expired.
title_not_available=Title not available yet
3 changes: 2 additions & 1 deletion ...amigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_ca.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -631,4 +631,5 @@ partTimer_info_end=El temps perm\u00E9s per a aquesta part ha expirat.
questionTimer_title=Temps restant per a aquesta pregunta
questionTimer_info_start=Pregunta temporitzada. Un cop feu clic a "Comen\u00e7ar", tindreu <b>{0}</b> per completar la pregunta. La pregunta <b>es lliurar\u00e0 quan s\u2019esgoti el termini</b>, sense tenir en compte si heu contestat.
questionTimer_info_start_deadline=Pregunta temporitzada. Un cop feu clic a "Comen\u00e7ar", tindreu <b>{0} o fins a {1}, el que sigui m\u00e9s curt</b> per completar la pregunta. La pregunta <b>es lliurar\u00e0 quan s\u2019esgoti el termini</b>, sense tenir en compte si heu contestat.
questionTimer_info_end=El temps perm\u00E9s per a aquesta pregunta ha expirat.
questionTimer_info_end=El temps perm\u00E9s per a aquesta pregunta ha expirat.
title_not_available=T\u00EDtol encara no disponible
5 changes: 1 addition & 4 deletions ...amigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_es.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,4 @@ questionTimer_title=Tiempo restante para esta pregunta
questionTimer_info_start=Pregunta temporizada. Una vez haga clic en "Comenzar", tendr\u00e1 <b>{0}</b> para poder completar esta pregunta. Ser\u00e1 <b>enviada transcurrido ese tiempo</b>, independientemente de si ha respondido.
questionTimer_info_start_deadline=Pregunta temporizada. Una vez haga clic en "Comenzar", tendr\u00e1 <b>{0} o hasta el {1}, lo que sea m\u00E1s corto</b> para poder completar esta pregunta. Ser\u00e1 <b>enviada transcurrido ese tiempo</b>, independientemente de si ha respondido.
questionTimer_info_end=El tiempo permitido para esta pregunta ha expirado.




title_not_available=T\u00EDtulo todav\u00EDa no disponible
3 changes: 2 additions & 1 deletion ...amigo-app/src/java/org/sakaiproject/tool/assessment/bundle/DeliveryMessages_eu.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -588,4 +588,5 @@ partTimer_info_end=The time allowed for this part has expired.
questionTimer_title=Time remaining for this question
questionTimer_info_start=Timed question. Once you click \"Start\" you will have <b>{0}</b> to complete this question. It will be <b>submitted at that time</b>, regardless of whether you have answered it.
questionTimer_info_start_deadline=Timed question. Once you click \"Start\" you will have <b>{0} or until {1} whichever is shorter</b> to complete this question. It will be <b>submitted at that time</b>, regardless of whether you have answered it.
questionTimer_info_end=The time allowed for this question has expired.
questionTimer_info_end=The time allowed for this question has expired.
title_not_available=Title not available yet
65 changes: 37 additions & 28 deletions samigo/samigo-app/src/webapp/jsf/delivery/tableOfContents.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,37 +160,46 @@ function saveTime()
<h:inputHidden id="outoftime" value="#{delivery.timeOutSubmission}"/>

<h:messages styleClass="sak-banner-error" rendered="#{! empty facesContext.maximumSeverity}" layout="table"/>
<h:dataTable value="#{delivery.tableOfContents.partsContents}" var="part">
<h:dataTable value="#{delivery.tableOfContents.partsContents}" var="part" styleClass="tableofcontents">
<h:column>
<h:panelGroup>
<samigo:hideDivision id="part" title = "#{deliveryMessages.p} #{part.number} - #{part.nonDefaultText} -
#{part.questions-part.unansweredQuestions}/#{part.questions} #{deliveryMessages.ans_q}, #{part.pointsDisplayString}#{deliveryMessages.splash}#{part.roundedMaxPoints} #{deliveryMessages.pt}" >
<h:dataTable value="#{part.itemContents}" var="question">
<h:column>
<f:verbatim><div class="tier3"></f:verbatim>
<h:panelGroup>
<h:graphicImage alt="#{deliveryMessages.alt_unans_q}"
url="/images/whiteBubble15.png" rendered="#{question.unanswered}"/>
<h:graphicImage alt="#{deliveryMessages.alt_unans_q}"
url="/images/blackBubble15.png" rendered="#{!question.unanswered}"/>
<h:graphicImage alt="#{deliveryMessages.alt_q_marked}"
url="/images/questionMarkBubble15.png" rendered="#{question.review}"/>
<h:commandLink title="#{deliveryMessages.t_takeAssessment}" immediate="true" action="takeAssessment">
<h:outputText escape="false" value="#{question.sequence}#{deliveryMessages.dot} #{question.strippedText}">
<f:convertNumber maxFractionDigits="2"/>
</h:outputText>
<h:outputText escape="false" value=" (#{question.pointsDisplayString}#{deliveryMessages.splash}#{question.roundedMaxPointsToDisplay} #{deliveryMessages.pt})" rendered="#{(delivery.settings.displayScoreDuringAssessments != '2' && question.itemData.scoreDisplayFlag) || question.pointsDisplayString!=''}">
<f:convertNumber maxFractionDigits="2" groupingUsed="false"/>
</h:outputText>
<f:param name="partnumber" value="#{part.number}" />
<f:param name="questionnumber" value="#{question.number}" />
<f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.delivery.UpdateTimerFromTOCListener" />
<f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.delivery.DeliveryActionListener" />
</h:commandLink>
</h:panelGroup>
<f:verbatim></div></f:verbatim>
</h:column>
</h:dataTable>
#{part.questions-part.unansweredQuestions}/#{part.questions} #{deliveryMessages.ans_q}, #{part.pointsDisplayString}#{deliveryMessages.splash}#{part.roundedMaxPoints} #{deliveryMessages.pt} #{part.timedSection ? '<i class=\"fa fa-clock-o\"></i>' : ''}" >
<h:panelGroup rendered="#{part.enabled >= 0}">
<h:dataTable value="#{part.itemContents}" var="question">
<h:column>
<f:verbatim><div class="tier3"></f:verbatim>
<h:panelGroup>
<h:graphicImage alt="#{deliveryMessages.alt_unans_q}"
url="/images/whiteBubble15.png" rendered="#{question.unanswered}"/>
<h:graphicImage alt="#{deliveryMessages.alt_unans_q}"
url="/images/blackBubble15.png" rendered="#{!question.unanswered}"/>
<h:graphicImage alt="#{deliveryMessages.alt_q_marked}"
url="/images/questionMarkBubble15.png" rendered="#{question.review}"/>
<h:commandLink immediate="true" action="takeAssessment"
><label <h:outputText value="class='inactive'" rendered="#{question.enabled == 0}" />
><h:outputText escape="false" value="#{question.sequence}#{deliveryMessages.dot}">
<f:convertNumber maxFractionDigits="2"/>
</h:outputText>
<h:outputText escape="false" value=" #{question.strippedText}" rendered="#{question.enabled >= 0}">
</h:outputText>
<h:outputText escape="false" value=" #{deliveryMessages.title_not_available}" rendered="#{question.enabled == -1}">
</h:outputText>
<h:outputText escape="false" value=" (#{question.pointsDisplayString}#{deliveryMessages.splash}#{question.roundedMaxPointsToDisplay} #{deliveryMessages.pt})" rendered="#{(delivery.settings.displayScoreDuringAssessments != '2' && question.itemData.scoreDisplayFlag) || question.pointsDisplayString!=''}">
<f:convertNumber maxFractionDigits="2" groupingUsed="false"/>
</h:outputText>
<h:outputText escape="false" rendered="#{question.timedQuestion}" value=" <i class='fa fa-clock-o'></i>" />
</label>
<f:param name="partnumber" value="#{part.number}" />
<f:param name="questionnumber" value="#{question.number}" />
<f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.delivery.UpdateTimerFromTOCListener" />
<f:actionListener type="org.sakaiproject.tool.assessment.ui.listener.delivery.DeliveryActionListener" />
</h:commandLink>
</h:panelGroup>
<f:verbatim></div></f:verbatim>
</h:column>
</h:dataTable>
</h:panelGroup>
</samigo:hideDivision>
</h:panelGroup>
</h:column>
Expand Down

0 comments on commit 148f18c

Please sign in to comment.