client: #24 - fixed milestone routes (roadmap_id was empty and status was...

client: #24 - fixed milestone routes (roadmap_id was empty and status was empty if checkbox was not selected)

client/blueprints/Milestones.py

@@ -14,8 +14,9 @@ def construct_blueprint(urlBuilder):
         if not roadmap_ID or int(roadmap_ID) < 0:
             return render_template('error.html', message=LOCALIZATION['error_param_invalid'])
 
+        roadmap = requests.get(urlBuilder.build_url('roadmap', roadmap_ID)).json()
         milestones = requests.get(urlBuilder.build_url('milestones', roadmap_ID)).json()
-        return render_template('admin/milestones/overview.html', milestones=milestones, roadmap_ID=roadmap_ID)
+        return render_template('admin/milestones/overview.html', milestones=milestones, roadmap=roadmap)
 
     @milestones.route('/admin/milestones/add', methods=['GET'])
     def add():
@@ -26,8 +27,11 @@ def construct_blueprint(urlBuilder):
 
     @milestones.route('/admin/milestones/add', methods=['POST'])
     def add_post():
+        params = dict(request.form)
+        params['Status'] = '1' if 'Status' in params else '0'
+
         success, response = ApiRequest.send_api_request(urlBuilder.build_url('milestone'),
-                                                        requests.post, request.form,
+                                                        requests.post, params,
                                                         ['RoadmapID', 'VersionCode', 'VersionName',
                                                          'Title', 'DueDate', 'CompletionDate', 'Status'])
         if not success:
@@ -43,19 +47,23 @@ def construct_blueprint(urlBuilder):
         milestone = requests.get(urlBuilder.build_url('milestone', ID)).json()
         return render_template('admin/milestones/edit.html',
                                title='Edit Milestone',
+                               roadmap_ID=request.args.get('roadmap_ID'),
                                milestone=milestone,
                                form_url=url_for('admin_milestones.edit_post'))
 
     @milestones.route('/admin/milestones/edit', methods=['POST'])
     def edit_post():
+        params = dict(request.form)
+        params['Status'] = '1' if 'Status' in params else '0'
+
         success, response = ApiRequest.send_api_request(urlBuilder.build_url('milestone'),
-                                                        requests.put, request.form,
+                                                        requests.put, params,
                                                         ['ID', 'RoadmapID', 'VersionCode', 'VersionName',
                                                          'Title', 'DueDate', 'CompletionDate', 'Status'])
 
         if not success:
             return response
-        return redirect(url_for('admin_milestones.overview', roadmap_ID=request.args.get('roadmap_ID')))
+        return redirect(url_for('admin_milestones.overview', roadmap_ID=params['RoadmapID']))
 
     @milestones.route('/admin/milestones/delete', methods=['GET'])
     def delete():

client/templates/admin/milestones/overview.html

@@ -8,12 +8,12 @@
         {{ macros.adminLogout() }}
         <div id="main">
             <div class="container">
-                <h2 class="center-align truncate" id="headline"><?php echo $projectName;?></h2>
+                <h2 class="center-align truncate" id="headline">{{ roadmap["Projectname"] }}</h2>
                 <h4 class="center-align" id="headline">Milestones</h4>
 
                 <div class="row">
                     <div class="col s12 m8 offset-m2 l6 offset-l3 center-align">
-                        <a class="waves-effect waves-light btn blue darken-3" href="{{ url_for("admin_milestones.add", roadmap_ID=roadmap_ID) }}"><i class="material-icons left">add</i>New</a>
+                        <a class="waves-effect waves-light btn blue darken-3" href="{{ url_for("admin_milestones.add", roadmap_ID=roadmap["ID"]) }}"><i class="material-icons left">add</i>New</a>
                     </div>
                 </div>
                 <div class="row">
@@ -47,8 +47,8 @@
                                             {% endif %}
 
                                             <td class="right-align">
-                                                <a class="btn-flat no-padding tooltipped" href="{{ url_for("admin_milestones.edit", ID=milestone["ID"]) }}" data-position="bottom" data-delay="50" data-tooltip="Edit"><i class="material-icons left">edit</i></a>
-                                                <a class="btn-flat button-delete-milestone no-padding tooltipped" href="{{ url_for("admin_milestones.delete", ID=milestone["ID"], roadmap_ID=roadmap_ID) }}" data-position="bottom" data-delay="50" data-tooltip="Delete"><i class="material-icons left">delete</i></a>
+                                                <a class="btn-flat no-padding tooltipped" href="{{ url_for("admin_milestones.edit", ID=milestone["ID"], roadmap_ID=roadmap["ID"]) }}" data-position="bottom" data-delay="50" data-tooltip="Edit"><i class="material-icons left">edit</i></a>
+                                                <a class="btn-flat button-delete-milestone no-padding tooltipped" href="{{ url_for("admin_milestones.delete", ID=milestone["ID"], roadmap_ID=roadmap["ID"]) }}" data-position="bottom" data-delay="50" data-tooltip="Delete"><i class="material-icons left">delete</i></a>
                                                 <a class="btn-flat no-padding tooltipped" href="{{ url_for("admin_tasks.overview", milestone_ID=milestone["ID"]) }}" data-position="bottom" data-delay="50" data-tooltip="Edit Tasks"><i class="material-icons left">assignment</i></a>
                                             </td>
                                         </tr>