Browse Source

Update for 2018

Thomas Ross 3 years ago
parent
commit
9d08447fee
3 changed files with 47 additions and 4 deletions
  1. 2
    2
      FRCScoutWeb/config.py
  2. 4
    1
      home/jinja2/home/index.html
  3. 41
    1
      tasks/fixtures/tasks.json

+ 2
- 2
FRCScoutWeb/config.py View File

@@ -1,3 +1,3 @@
1
-CURRENT_FRC_YEAR = 2017
1
+CURRENT_FRC_YEAR = 2018
2 2
 
3
-ALLOWED_YEARS = [2016, 2017]
3
+ALLOWED_YEARS = [2016, 2017, 2018]

+ 4
- 1
home/jinja2/home/index.html View File

@@ -79,6 +79,9 @@
79 79
         <span class="mdc-select__selected-text">{{ request.session.user_selected_year or FRCScoutWeb.config.CURRENT_FRC_YEAR }}</span>
80 80
         <div class="mdc-simple-menu mdc-select__menu">
81 81
             <ul class="mdc-list mdc-simple-menu__items">
82
+                <li class="mdc-list-item" role="option" id="2018" tabindex="0">
83
+                    2018
84
+                </li>
82 85
                 <li class="mdc-list-item" role="option" id="2017" tabindex="0">
83 86
                     2017
84 87
                 </li>
@@ -138,4 +141,4 @@
138 141
        tabindex="0">
139 142
         <span class="mdc-fab__icon">add</span>
140 143
     </a>
141
-{% endblock %}
144
+{% endblock %}

+ 41
- 1
tasks/fixtures/tasks.json View File

@@ -142,5 +142,45 @@
142 142
       "name": "Scale Tower",
143 143
       "year": 2016
144 144
     }
145
+  },
146
+  {
147
+    "model":"tasks.task",
148
+    "pk":"switch-2018",
149
+    "fields":{
150
+      "name":"Switch",
151
+      "year":2018
152
+    }
153
+  },
154
+  {
155
+    "model":"tasks.task",
156
+    "pk":"vault-2018",
157
+    "fields":{
158
+      "name":"Vault",
159
+      "year":2018
160
+    }
161
+  },
162
+  {
163
+    "model":"tasks.task",
164
+    "pk":"scale-2018",
165
+    "fields":{
166
+      "name":"Scale",
167
+      "year":2018
168
+    }
169
+  },
170
+  {
171
+    "model":"tasks.task",
172
+    "pk":"climb-2018",
173
+    "fields":{
174
+      "name":"Climb",
175
+      "year":2018
176
+    }
177
+  },
178
+  {
179
+    "model":"tasks.task",
180
+    "pk":"climb-partner-2018",
181
+    "fields":{
182
+      "name":"Climb with Partner",
183
+      "year":2018
184
+    }
145 185
   }
146
-]
186
+]