Moved election_years_available into a constants file. Added ability to filter Candidate's page so we can see all candidates in one year.

Author: DaleMcGrew

campaign/views_admin.py

@@ -550,8 +550,6 @@ def campaign_list_view(request):
     show_issues = request.GET.get('show_issues', '')
     show_organizations_without_email = positive_value_exists(request.GET.get('show_organizations_without_email', False))
 
-    election_years_available = [2022, 2021, 2020, 2019, 2018, 2017, 2016]
-
     messages_on_stage = get_messages(request)
     campaignx_manager = CampaignXManager()
 
@@ -722,7 +720,6 @@ def campaign_list_view(request):
         'campaignx_type_filter':                    campaignx_type_filter,
         'campaignx_types':                          [],
         'client_organization_list':                 client_organization_list,
-        'election_years_available':                 election_years_available,
         'final_election_date_plus_cool_down':       final_election_date_plus_cool_down,
         'google_civic_election_id':                 google_civic_election_id,
         'hide_campaigns_not_visible_yet':           hide_campaigns_not_visible_yet,
@@ -833,8 +830,6 @@ def campaign_supporters_list_view(request, campaignx_we_vote_id=""):
     show_supporters_not_visible_to_public = \
         positive_value_exists(request.GET.get('show_supporters_not_visible_to_public', False))
 
-    election_years_available = [2022, 2021, 2020, 2019, 2018, 2017, 2016]
-
     messages_on_stage = get_messages(request)
 
     campaignx = CampaignX.objects.get(we_vote_id__iexact=campaignx_we_vote_id)
@@ -927,7 +922,6 @@ def campaign_supporters_list_view(request, campaignx_we_vote_id=""):
         'campaignx_search':                         campaignx_search,
         'campaignx_we_vote_id':                     campaignx_we_vote_id,
         'campaignx_title':                          campaignx_title,
-        'election_years_available':                 election_years_available,
         'google_civic_election_id':                 google_civic_election_id,
         'limit_to_opinions_in_state_code':          limit_to_opinions_in_state_code,
         'limit_to_opinions_in_this_year':           limit_to_opinions_in_this_year,

candidate/models.py

@@ -339,6 +339,14 @@ def retrieve_all_candidates_for_one_year(
             limit_to_this_state_code='',
             search_string=False,
             return_list_of_objects=False):
+        """
+        This might generate different results than retrieve_candidate_we_vote_id_list_from_year_list.
+        :param candidate_year:
+        :param limit_to_this_state_code:
+        :param search_string:
+        :param return_list_of_objects:
+        :return:
+        """
         candidate_list_objects = []
         candidate_list_light = []
         candidate_list_found = False
@@ -1661,6 +1669,38 @@ def retrieve_candidate_we_vote_id_list_from_office_list(
         }
         return results
 
+    def retrieve_candidate_we_vote_id_list_from_year_list(
+            self,
+            limit_to_this_state_code='',
+            year_list=[]):
+        """
+        This might return different results than retrieve_all_candidates_for_one_year.
+        :param limit_to_this_state_code:
+        :param year_list:
+        :return:
+        """
+        status = ''
+        success = True
+        candidate_we_vote_id_list = []
+
+        candidate_query = CandidateCampaign.objects.all()
+        candidate_query = candidate_query.filter(candidate_year__in=year_list)
+        if positive_value_exists(limit_to_this_state_code):
+            candidate_query = candidate_query.filter(state_code__iexact=limit_to_this_state_code)
+
+        try:
+            candidate_we_vote_id_list = candidate_query.values_list('we_vote_id', flat=True).distinct()
+        except Exception as e:
+            status += 'ERROR_WITH_DATABASE_QUERY: ' + str(e) + ' '
+            success = False
+
+        results = {
+            'status':                       status,
+            'success':                      success,
+            'candidate_we_vote_id_list':    candidate_we_vote_id_list,
+        }
+        return results
+
     def fetch_candidate_we_vote_id_list_from_office_we_vote_id(self, office_we_vote_id):
         results = self.retrieve_all_candidates_for_office(office_we_vote_id=office_we_vote_id)
         if not positive_value_exists(results['candidate_list_found']):

candidate/views_admin.py

@@ -20,7 +20,7 @@
 from ballot.models import BallotReturnedListManager
 from bookmark.models import BookmarkItemList
 from config.base import get_environment_variable
-from election.controllers import retrieve_upcoming_election_id_list
+from election.controllers import retrieve_election_id_list_by_year_list, retrieve_upcoming_election_id_list
 from election.models import ElectionManager
 from exception.models import handle_record_found_more_than_one_exception, \
     handle_record_not_found_exception, print_to_log
@@ -38,6 +38,7 @@
 from voter_guide.models import VoterGuide
 from wevote_functions.functions import convert_to_int, extract_twitter_handle_from_text_string, list_intersection, \
     positive_value_exists, STATE_CODE_MAP, display_full_name_with_correct_capitalization
+from wevote_settings.constants import ELECTION_YEARS_AVAILABLE
 from wevote_settings.models import RemoteRequestHistory, \
     RETRIEVE_POSSIBLE_GOOGLE_LINKS, RETRIEVE_POSSIBLE_TWITTER_HANDLES
 from .controllers import candidates_import_from_master_server, candidates_import_from_sample_file, \
@@ -332,6 +333,7 @@ def candidate_list_view(request):
         positive_value_exists(request.GET.get('show_candidates_with_twitter_options', False))
     show_election_statistics = positive_value_exists(request.GET.get('show_election_statistics', False))
     show_marquee_or_battleground = positive_value_exists(request.GET.get('show_marquee_or_battleground', False))
+    show_this_year_of_candidates = convert_to_int(request.GET.get('show_this_year_of_candidates', 0))
 
     review_mode = positive_value_exists(request.GET.get('review_mode', False))
 
@@ -392,9 +394,13 @@ def candidate_list_view(request):
     #         messages.add_message(request, messages.INFO, "candidates_migrated: " + str(candidates_migrated))
 
     google_civic_election_id_list_generated = False
+    show_this_year_of_candidates_restriction = False
     if positive_value_exists(google_civic_election_id):
         google_civic_election_id_list = [convert_to_int(google_civic_election_id)]
         google_civic_election_id_list_generated = True
+    elif positive_value_exists(show_this_year_of_candidates):
+        google_civic_election_id_list = retrieve_election_id_list_by_year_list([show_this_year_of_candidates])
+        show_this_year_of_candidates_restriction = True
     elif positive_value_exists(show_all_elections):
         google_civic_election_id_list = []
     else:
@@ -403,7 +409,12 @@ def candidate_list_view(request):
         google_civic_election_id_list = retrieve_upcoming_election_id_list()
 
     candidate_we_vote_id_list = []
-    if google_civic_election_id_list_generated:
+    if show_this_year_of_candidates_restriction:
+        results = candidate_list_manager.retrieve_candidate_we_vote_id_list_from_year_list(
+            year_list=[show_this_year_of_candidates],
+            limit_to_this_state_code=state_code)
+        candidate_we_vote_id_list = results['candidate_we_vote_id_list']
+    elif google_civic_election_id_list_generated:
         results = candidate_list_manager.retrieve_candidate_we_vote_id_list_from_election_list(
             google_civic_election_id_list=google_civic_election_id_list,
             limit_to_this_state_code=state_code)
@@ -490,10 +501,12 @@ def candidate_list_view(request):
 
     # Figure out the subset of candidate_we_vote_ids to look up
     filtered_candidate_we_vote_id_list = []
-    if google_civic_election_id_list_generated and show_marquee_or_battleground:
+    # show_this_year_of_candidates_restriction
+    if (google_civic_election_id_list_generated or show_this_year_of_candidates_restriction) \
+            and show_marquee_or_battleground:
         filtered_candidate_we_vote_id_list = list_intersection(
             candidate_we_vote_id_list, battleground_candidate_we_vote_id_list)
-    elif google_civic_election_id_list_generated:
+    elif google_civic_election_id_list_generated or show_this_year_of_candidates_restriction:
         filtered_candidate_we_vote_id_list = candidate_we_vote_id_list
     elif show_marquee_or_battleground:
         filtered_candidate_we_vote_id_list = battleground_candidate_we_vote_id_list
@@ -502,7 +515,8 @@ def candidate_list_view(request):
     try:
         candidate_query = CandidateCampaign.objects.all()
         if positive_value_exists(google_civic_election_id_list_generated) \
-                or positive_value_exists(show_marquee_or_battleground):
+                or positive_value_exists(show_marquee_or_battleground) \
+                or positive_value_exists(show_this_year_of_candidates_restriction):
             candidate_query = candidate_query.filter(we_vote_id__in=filtered_candidate_we_vote_id_list)
         if positive_value_exists(state_code):
             candidate_query = candidate_query.filter(state_code__iexact=state_code)
@@ -870,6 +884,7 @@ def candidate_list_view(request):
         'current_page_minus_candidate_tools_url':   current_page_minus_candidate_tools_url,
         'election':                                 election,
         'election_list':                            election_list,
+        'election_years_available':                 ELECTION_YEARS_AVAILABLE,
         'facebook_urls_without_picture_urls':       facebook_urls_without_picture_urls,
         'find_candidates_linked_to_multiple_offices':   find_candidates_linked_to_multiple_offices,
         'google_civic_election_id':                 google_civic_election_id,
@@ -886,6 +901,7 @@ def candidate_list_view(request):
         'show_candidates_without_twitter':          show_candidates_without_twitter,
         'show_election_statistics':                 show_election_statistics,
         'show_marquee_or_battleground':             show_marquee_or_battleground,
+        'show_this_year_of_candidates':             show_this_year_of_candidates,
         'state_code':                               state_code,
         'state_list':                               sorted_state_list,
         'total_twitter_handles':                    total_twitter_handles,

issue/views_admin.py

@@ -23,6 +23,7 @@
 from voter_guide.models import VoterGuideListManager
 import wevote_functions.admin
 from wevote_functions.functions import convert_to_int, positive_value_exists, get_voter_device_id, STATE_CODE_MAP
+from wevote_settings.constants import ELECTION_YEARS_AVAILABLE
 from django.http import HttpResponse
 import json
 
@@ -833,7 +834,6 @@ def issue_partisan_analysis_view(request):
 
     issue_search = request.GET.get('issue_search', '')
     show_hidden_issues = False
-    election_years_available = [2022, 2021, 2020, 2019, 2018, 2017, 2016]
 
     organization_we_vote_id_in_this_election_list = []
     organization_retrieved_list = {}
@@ -842,7 +842,7 @@ def issue_partisan_analysis_view(request):
     voter_guide_list_manager = VoterGuideListManager()
 
     if show_statistics_for_all_elections:
-        election_year_list_to_show = election_years_available
+        election_year_list_to_show = ELECTION_YEARS_AVAILABLE
         show_stats_for_this_google_civic_election_id_list = \
             retrieve_election_id_list_by_year_list(election_year_list_to_show=election_year_list_to_show)
         google_civic_election_id_list_for_dropdown = show_stats_for_this_google_civic_election_id_list
@@ -1099,7 +1099,7 @@ def issue_partisan_analysis_view(request):
 
     template_values = {
         'election_list':                election_list,
-        'election_years_available':     election_years_available,
+        'election_years_available':     ELECTION_YEARS_AVAILABLE,
         'endorsement_count_left':       endorsement_count_left,
         'endorsement_with_commentary_count_left': endorsement_with_commentary_count_left,
         'endorsement_count_center':     endorsement_count_center,

organization/views_admin.py

@@ -47,6 +47,7 @@
 import wevote_functions.admin
 from wevote_functions.functions import convert_to_int, extract_twitter_handle_from_text_string, positive_value_exists, \
     STATE_CODE_MAP
+from wevote_settings.constants import ELECTION_YEARS_AVAILABLE
 
 
 ORGANIZATION_STANCE_CHOICES = (
@@ -449,8 +450,6 @@ def organization_list_view(request):
     show_organizations_to_be_analyzed = \
         positive_value_exists(request.GET.get('show_organizations_to_be_analyzed', False))
 
-    election_years_available = [2022, 2021, 2020, 2019, 2018, 2017, 2016]
-
     messages_on_stage = get_messages(request)
     organization_list_query = Organization.objects.all()
     if positive_value_exists(sort_by):
@@ -644,7 +643,7 @@ def organization_list_view(request):
 
     template_values = {
         'candidate_we_vote_id':     candidate_we_vote_id,
-        'election_years_available': election_years_available,
+        'election_years_available': ELECTION_YEARS_AVAILABLE,
         'google_civic_election_id': google_civic_election_id,
         'issue_list':               issue_list,
         'issues_selected':          issues_selected,

position/views_admin.py

@@ -31,6 +31,7 @@
 import wevote_functions.admin
 from wevote_functions.functions import convert_to_int, convert_integer_to_string_with_comma_for_thousands_separator, \
     positive_value_exists, STATE_CODE_MAP
+from wevote_settings.constants import ELECTION_YEARS_AVAILABLE
 from django.http import HttpResponse
 import json
 
@@ -251,7 +252,6 @@ def position_list_view(request):
     state_code = request.GET.get('state_code', '')
     state_list = STATE_CODE_MAP
     state_list_modified = {}
-    election_years_available = [2022, 2021, 2020, 2019, 2018, 2017, 2016]
 
     position_search = request.GET.get('position_search', '')
 
@@ -565,7 +565,7 @@ def position_list_view(request):
         'position_list':            position_list,
         'position_search':          position_search,
         'election_list':            election_list,
-        'election_years_available': election_years_available,
+        'election_years_available': ELECTION_YEARS_AVAILABLE,
         'google_civic_election_id': google_civic_election_id,
         'show_all_elections':       show_all_elections,
         'show_statistics':          show_statistics,

templates/candidate/candidate_list.html

@@ -44,6 +44,20 @@ <h1>Candidates</h1>
     </label>
     &nbsp;&nbsp;&nbsp;&nbsp;
 
+    {% if election_years_available %}
+    <select id="show_this_year_of_candidates_id" name="show_this_year_of_candidates">
+        <option value="0" {% if 0 == show_this_year_of_candidates|convert_to_int %} selected="selected"{% endif %}>
+            -- Choose Year --</option>
+        {% for year in election_years_available %}
+        <option value="{{ year }}"
+                {% if show_this_year_of_candidates|slugify == year|slugify %} selected="selected"{% endif %}>
+            {% if show_this_year_of_candidates|slugify == year|slugify %}Limited To {% endif %}
+            {{ year }}</option>
+        {% endfor %}
+    </select>
+    {% endif %}{# End of if election_years_available #}
+    &nbsp;&nbsp;&nbsp;&nbsp;
+
     {# Show candidates which are either marquee or battleground #}
     <label for="show_marquee_or_battleground_id">
       <input type="checkbox" name="show_marquee_or_battleground" id="show_marquee_or_battleground_id" value="1"
@@ -257,7 +271,7 @@ <h1>Candidates</h1>
 <br />
 <form name="candidate_search" method="get" action="{% url 'candidate:candidate_list' %}">
     {% if candidate_search %}
-    <a href="{% url 'candidate:candidate_list' %}?google_civic_election_id={{ google_civic_election_id }}&state_code={{ state_code }}">
+    <a href="{% url 'candidate:candidate_list' %}?google_civic_election_id={{ google_civic_election_id }}&show_all_elections={{ show_all_elections }}&show_this_year_of_candidates={{ show_this_year_of_candidates }}&state_code={{ state_code }}">
          clear search</a>&nbsp;
     {% endif %}
     <input type="hidden" name="google_civic_election_id" value="{{ google_civic_election_id }}" />
@@ -267,6 +281,7 @@ <h1>Candidates</h1>
     <input type="hidden" name="show_all_elections" id="show_all_elections_id" value="{{ show_all_elections }}" />
     <input type="hidden" name="show_election_statistics" value="{{ show_election_statistics }}" />
     <input type="hidden" name="show_marquee_or_battleground" value="{{ show_marquee_or_battleground }}" />
+    <input type="hidden" name="show_this_year_of_candidates" value="{{ show_this_year_of_candidates }}" />
 
     <input type="submit" value="Search for Candidate" />
 
@@ -690,6 +705,11 @@ <h1>Candidates</h1>
             this.form.submit();
         });
     });
+    $(function() {
+        $('#show_this_year_of_candidates_id').change(function() {
+            this.form.submit();
+        });
+    });
     $(function() {
         $('#state_code_id').change(function() {
             this.form.submit();

templates/candidate/candidate_merge.html

@@ -113,6 +113,12 @@ <h1>{% if candidate_option1 %}Merge {{ candidate_option1.candidate_name }}{% els
 
 {% include "candidate/candidate_merge_one_field_decision.html" with field_name="party" field_label="Party" conflict_status=conflict_values.party candidate1_field_value=candidate_option1.party candidate2_field_value=candidate_option2.party candidate1=candidate_option1 candidate2=candidate_option2 %}
 
+    <tr>
+        <td>Candidate Year</td>
+        <td>{{ candidate_option1.candidate_year|default_if_none:"" }}</td>
+        <td>{{ candidate_option2.candidate_year|default_if_none:"" }}</td>
+    </tr>
+
     {% if candidate_option1.id != None or candidate_option2.id != None %}
     <tr>
         <td>ID</td>

templates/candidate/candidate_summary.html

@@ -85,6 +85,12 @@ <h1>{{ candidate.candidate_name }}</h1>
 
       </td>
     </tr>
+    <tr>
+      <td>Candidate Year:</td>
+      <td>
+        <strong>{{ candidate.candidate_year }}</strong>
+      </td>
+    </tr>
     <tr>
       <td>Contest Office:</td>
       <td>
@@ -158,6 +164,7 @@ <h3>Merge with Another Candidate</h3>
             <th>ID</th>
             <th>We Vote ID</th>
             <th>Candidate Name</th>
+            <th>Year</th>
             <th>State</th>
             <th>Ballotpedia Race ID</th>
             <th>Ballotpedia Candidate ID</th>
@@ -178,6 +185,7 @@ <h3>Merge with Another Candidate</h3>
               (<a href="{% url 'candidate:candidate_summary' found_candidate.id %}?google_civic_election_id={{ google_civic_election_id }}&state_code={{ state_code }}" target="_blank">view&nbsp;summary</a>,
               <a href="{% url 'candidate:compare_two_candidates_for_merge' %}?candidate1_we_vote_id={{ candidate.we_vote_id }}&candidate2_we_vote_id={{ found_candidate.we_vote_id }}&google_civic_election_id={{ google_civic_election_id }}&state_code={{ state_code }}" target="_blank">compare&nbsp;for&nbsp;merge</a>)
             </td>
+            <td>{{ found_candidate.candidate_year }}</td>
             <td>{{ found_candidate.state_code }}</td>
             <td>{{ found_candidate.ballotpedia_race_id|default_if_none:"" }}</td>
             <td>{{ found_candidate.ballotpedia_candidate_id|default_if_none:"" }}</td>

templates/position/position_list.html

@@ -67,7 +67,7 @@ <h1>Opinions/Positions</h1>
             {{ year }}</option>
         {% endfor %}
     </select>
-    {% endif %}{# End of if election_list #}
+    {% endif %}{# End of if election_years_available #}
 
     {% if state_list %}
         <select id="state_code_id" name="state_code">