From 73a46607eab5d53e4db7ea580e2c0f8bdc6ba6c3 Mon Sep 17 00:00:00 2001
From: Frank Duncan <frankduncan@opentechstrategies.com>
Date: Fri, 7 Mar 2025 13:08:02 -0600
Subject: [PATCH] Add tags to 100Change2025
---
.../files/100Change2025ExploreTable | 6 +++-
.../100Change2025/files/100ChangeProposal | 35 +++++++++----------
.../100Change2025/etl/compose-and-upload | 1 +
3 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/competitions/100Change2025/ansible/roles/100Change2025/files/100Change2025ExploreTable b/competitions/100Change2025/ansible/roles/100Change2025/files/100Change2025ExploreTable
index 43717a61..691845d0 100644
--- a/competitions/100Change2025/ansible/roles/100Change2025/files/100Change2025ExploreTable
+++ b/competitions/100Change2025/ansible/roles/100Change2025/files/100Change2025ExploreTable
@@ -1,4 +1,8 @@
<div id="torque-explore--table-view">
+ <div style="position:absolute; top:0px; right:0px">
+ <div style="display:inline-block; width:50px; height:2rem; background-color: #D3EAFA;margin-left:-60px"></div>
+ <div style="display:block; height:2rem; margin-top:-2rem;position:relative">Federally Funded</div>
+ </div>
{%- set top_proposals = [] %}
{%- set wildcard_proposals = [] %}
{%- set other_proposals = [] %}
@@ -35,7 +39,7 @@
</thead>
<tbody>
{%- for proposal in proposals %}
- <tr>
+ <tr {% if "Tags" in proposal and "Federally Funded" in proposal["Tags"]%}style="background-color: #D3EAFA"{% endif %}>
<td>{{proposal["Rank"]}}</td>
<td><a href="/100Change2025/index.php/{{proposal["MediaWiki Title"] | e}}">{{proposal["Organization Name"]}}</a></td>
<td>{{proposal["Organization Location"]["City"]}},
diff --git a/competitions/100Change2025/ansible/roles/100Change2025/files/100ChangeProposal b/competitions/100Change2025/ansible/roles/100Change2025/files/100ChangeProposal
index 40d998ae..fb68cbd6 100644
--- a/competitions/100Change2025/ansible/roles/100Change2025/files/100ChangeProposal
+++ b/competitions/100Change2025/ansible/roles/100Change2025/files/100ChangeProposal
@@ -13,26 +13,10 @@
<div id="sdg-options" class="torque-edit-options-list">
{{ sdgs_table() }}
</div>
-<div id="caf-review-options" class="torque-edit-options-list">
+<div id="tags-options" class="torque-edit-options-list">
{|
|-
-|Not Completed
-|-
-|In Progress
-|-
-|Completed
-|}
-</div>
-<div id="organizational-circumstance-options" class="torque-edit-options-list">
-{|
-|-
-|Applicant Organization has an interim leadership team in place or is undergoing a leadership transition.
-|-
-|Applicant Organization is a defendant in a lawsuit, either pending or in process, where charges may include claims of discrimination, sexual misconduct, or fraud.
-|-
-|Substantial negative information about Applicant Organization has appeared repeatedly in print, broadcast, and/or on social media.
-|-
-|None of the above.
+|Federally Funded
|}
</div>
@@ -75,6 +59,21 @@ __TOC__
<div class="lfc--inside-cache" id="accordion-rankedchoice"></div>
</div>
</div>
+<div id="proposal-challenge-stage" class="accordion-item">
+<div class="accordion-title">Tags</div>
+<div class="accordion-content">
+<dl class="lfc--datapairs">
+<div class="pair">
+<dt>Tags <span class="torque-edit-button" data-type="list-of-options" data-list-id="tags-options" data-field="Tags"></span></dt>
+<dd>
+{% for tag in proposal['Tags'] %}
+* <span class="torque--explore-link" data-filter-name="tags" data-filter-value="{{tag}}">[[Special:TorqueExplore|{{tag}}]]</span>
+{% endfor %}
+</dd>
+</div>
+</dl>
+</div>
+</div>
{%- if "LLM LFC Analysis" in proposal and proposal ["LLM LFC Analysis"] -%}
<div id="proposal-analysis-support" class="accordion-item theme--llm open">
<div class="accordion-title">
diff --git a/competitions/100Change2025/etl/compose-and-upload b/competitions/100Change2025/etl/compose-and-upload
index e321dd93..9afcc95f 100755
--- a/competitions/100Change2025/etl/compose-and-upload
+++ b/competitions/100Change2025/etl/compose-and-upload
@@ -706,6 +706,7 @@ def main():
rank_comparison_toc.proposals = [p for p in comp.ordered_proposals() if p.cell("Panel Score")["Raw"]]
comp.add_toc(rank_comparison_toc )
+ comp.add_toc(toc.GenericToc("Federally_Funded", toc.GenericToc.ListColumnAccessor("Tags")))
comp.add_toc(toc.GenericToc("Populations", toc.GenericToc.ListColumnAccessor("Priority Populations")))
comp.add_toc(toc.GenericToc("Organization_Legal_Status", "Organization Legal Status"))
comp.add_toc(toc.GenericToc("Team_Collaboration", "Team Collaboration"))
--
GitLab