translations and better new gym flow

competitionsEngine.py

@@ -1395,13 +1395,13 @@ def generate_dummy_routes(size):
     routes_id = str(uuid.uuid4().hex)
     routes = {"id":routes_id }
     routesA = []
-    for i in range(1, size):
+    for i in range(1, size+1):
         route_id = str(uuid.uuid4().hex)
-        route = _get_route_dict(route_id, str(i), '1', '#2E8857', 'solid', '-', '', '', '', '')
+        route = _get_route_dict(route_id, str(i), '1', '#2E8857', 'solid', '-', 'route'+str(i), '', '', '')
         routesA.append(route)
 
     routes['routes'] = routesA
-    routes['name'] = "Dummy routes"
+    routes['name'] = "Default routes"
     return routes
 
 

language/fr_FR.json

@@ -147,10 +147,10 @@
   "ado_contest_rules": "Règlement Ado",
   "contact_email": "Contacter les organisateurs",
 
-  "activities": "Activities",
-  "add_activity": "Add activity",
-  "delete_activity": "Delete activity",
-  "activity": "Activity",
+  "activities": "Activités",
+  "add_activity": "Nouvelle activité",
+  "delete_activity": "Supprimer activité",
+  "activity": "Activité",
   "activity_name": "Activity name",
   "activity_date": "Activity date",
   "activity_time": "Activity time",

language/pl_PL.json

@@ -149,15 +149,15 @@
   "ado_contest_rules": "Ado contest rules",
   "contact_email": "Contact organizers",
 
-  "activities": "Activities",
-  "add_activity": "Add activity",
-  "delete_activity": "Delete activity",
-  "activity": "Activity",
-  "activity_name": "Activity name",
-  "activity_date": "Activity date",
-  "activity_time": "Activity time",
-  "activity_location": "Activity location",
-  "activity_description": "Activity description",
+  "activities": "Wyczyny",
+  "add_activity": "Dodaj wyczyn",
+  "delete_activity": "Wymaż wyczyn",
+  "activity": "Wyczyn",
+  "activity_name": "Nazwa wyczynu",
+  "activity_date": "Data wyczynu",
+  "activity_time": "Czas wyczynu",
+  "activity_location": "Lokalizacja wyczynu",
+  "activity_description": "Opis wyczynu",
   "attempted": "Spróbowane",
   "flashed": "Flashed",
 

main_app_ui.py

@@ -1840,11 +1840,19 @@ def gyms_add():
     routes = competitionsEngine.generate_dummy_routes(int(numberOfRoutes))
     competitionsEngine.upsert_routes(routes['id'], gym_id, routes)
     gym = competitionsEngine.add_gym(user, gym_id, routes['id'], gymName, imgfilename, url, address, organization, [])
+    gym['routes'] = routes
+    routes_id = routes['id']
+    #competitionsEngine.update_gym(gym_id, gym)
+    #gym2 = competitionsEngine.get_gym(gym_id)
+    #all_routes = competitionsEngine.get_routes_by_gym_id(gym_id)
+    #routes=gym2['routes']
+    #gyms = competitionsEngine.get_gyms()
 
-    gyms = competitionsEngine.get_gyms()
-
-    return render_template('gyms.html',
+    return render_template('gym-routes.html',
                            competitionId=None,
+                           gymid=gym_id,
+                           routesid=routes_id,
+                           gyms=None,
                            gym=gym,
                            routes=routes,
                            reference_data=competitionsEngine.reference_data,

views/activities.html

@@ -113,7 +113,7 @@ <h2>{{ reference_data['current_language'].add_activity }}</h2>
                 <div class="form-row">
 
                         <label for="activity_name">Name:</label>
-                        <input type="text" id="activity_name" name="activitiy_name" value="My activity" size="40">
+                        <input type="text" id="activity_name" name="activitiy_name" value="{{ reference_data['current_language'].activity}}" size="40">
                       </div>
                       <div class="form-row">
 
@@ -123,7 +123,7 @@ <h2>{{ reference_data['current_language'].add_activity }}</h2>
 
                 <button id='editbutton' type="button" class="btn btn-primary btn-lg" onclick="saveData();">Create</button>&nbsp;
 
-                <button id='cancelbutton' type="button" class="btn btn-primary  btn-lg" onclick="closeDialog()">Cancel</button>
+                <button id='cancelbutton' type="button" class="btn btn-secondary  btn-lg" onclick="closeDialog()">Cancel</button>
             </div> 
             </div>
 
@@ -228,7 +228,7 @@ <h3>{{ reference_data['current_language'].activities}}
     function clearModal(){
         document.getElementById('hidden_message').textContent='';
 
-        document.getElementById('activity_name').value = 'My activity';
+        document.getElementById('activity_name').value = '{{ reference_data['current_language'].activity}}';
 
     }
 

views/activity-detail.html

@@ -141,7 +141,7 @@
 
                         <button id='editbutton' type="button" class="btn btn-primary btn-lg" onclick="saveData('climbed');">Save</button>&nbsp;
 
-                <button id='cancelbutton' type="button" class="btn btn-primary  btn-lg" onclick="closeDialog()">Cancel</button>
+                <button id='cancelbutton' type="button" class="btn btn-secondary  btn-lg" onclick="closeDialog()">Cancel</button>
             </div> 
             </div>