Bladeren bron

Fixes for Transformative Action page

-Deleted code that was commented.
-Change the order of function definition in the controller.
-Fixed the use of clean input and validator in the controller.
onielm 3 jaren geleden
bovenliggende
commit
ce35d2425d

+ 476
- 564
app/controllers/TransformativeActionsController.php
Diff onderdrukt omdat het te groot bestand
Bestand weergeven


+ 9
- 19
app/views/local/managers/admins/transformativeAction.blade.php Bestand weergeven

@@ -22,13 +22,13 @@
22 22
               {{ Form::open(array('action' => 'TransformativeActionsController@createTA')) }}
23 23
 
24 24
               <div class="form-group">
25
-                {{ Form::label('createText', 'Name') }}
26
-                {{ Form::text('createText', '', array('class' => 'form-control')) }}
25
+                {{ Form::label('text', 'Name') }}
26
+                {{ Form::text('text', '', array('class' => 'form-control')) }}
27 27
               </div>
28 28
 
29 29
               <div class="form-group">
30
-                {{ Form::label('createDescription', 'Description') }}
31
-                {{ Form::textarea('createDescription', '', array('class' => 'form-control')) }}
30
+                {{ Form::label('description', 'Description') }}
31
+                {{ Form::textarea('description', '', array('class' => 'form-control')) }}
32 32
               </div>
33 33
 
34 34
               <div class="form-group"> </div>
@@ -72,21 +72,15 @@
72 72
               <label>Associated Objectives</label>
73 73
               <div class="" id="">
74 74
                 <div class="form-group col-md-11">
75
-                  {{-- <select class="form-control selectpicker"> --}}
76 75
                   <select name="objectiveid[]" class="form-control createObjectives">
77
-                    {{-- @foreach ($objectives as $id => $text)
78
-                      <option value="{{$id}}">{{$text}}</option>
79
-                    @endforeach --}}
80 76
                     <option value="">First, select an Outcome</option>
81 77
                   </select>
82
-                  {{-- {{ Form::select('objective[]', $objectives, reset($objectives),  ['class'=>'form-control selectpicker', 'id' =>'objective0']) }} --}}
83 78
                 </div>
84 79
                 <button type="button" class='btn btn-md btn-primary col-md-1 remove-objective'>
85 80
                   X
86 81
                 </button>
87 82
               </div>
88 83
               <button type="button" class='btn btn-md btn-secondary add-objective'>
89
-              {{-- <button type="button" class='btn btn-md btn-secondary add-create-objective'> --}}
90 84
                 <span class='glyphicon glyphicon-plus'>
91 85
                 </span>
92 86
                 Add another Objective
@@ -154,11 +148,9 @@
154 148
                     @if (count($ta_approval_panel) == 0)
155 149
                       <option value="0">No TAs available</option>
156 150
                     @else
157
-                      {{-- <option value="0">Select a TA</option> --}}
158 151
                     @endif
159 152
                     @foreach ($ta_approval_panel as $ta)
160 153
                       <option value="{{$ta->id}}">{{$ta->at_text}}</option>
161
-                     {{-- <option value="{{$ta->id}}">{{$ta->at_text}}</option> --}}
162 154
                    @endforeach
163 155
                   </select>
164 156
                 </div>
@@ -274,7 +266,6 @@
274 266
                      @if (count($ta_edit_panel) == 0)
275 267
                        <option value="0">No TAs available</option>
276 268
                      @else
277
-                       {{-- <option value="0">Select a TA</option> --}}
278 269
                      @endif
279 270
                      @foreach ($ta_edit_panel as $ta)
280 271
                       <option value="{{$ta->id}}">{{$ta->at_text}}</option>
@@ -284,14 +275,14 @@
284 275
               </div>
285 276
 
286 277
               <div class="form-group" id="editName">
287
-                {{ Form::label('editText', 'Name') }}
288
-                {{ Form::text('editText', '', array('class' => 'form-control')) }}
278
+                {{ Form::label('text', 'Name') }}
279
+                {{ Form::text('text', '', array('class' => 'form-control')) }}
289 280
               </div>
290 281
               <input type='hidden' name='ta_id' class='updateTA' value="0">
291 282
 
292 283
               <div class="form-group">
293
-                {{ Form::label('editDescription', 'Description') }}
294
-                {{ Form::textarea('editDescription', '', array('class' => 'form-control')) }}
284
+                {{ Form::label('description', 'Description') }}
285
+                {{ Form::textarea('description', '', array('class' => 'form-control')) }}
295 286
               </div>
296 287
 
297 288
               <div class="form-group"> </div>
@@ -332,7 +323,6 @@
332 323
                       <option value="{{$id}}">{{$text}}</option>
333 324
                     @endforeach
334 325
                   </select>
335
-                  {{-- {{ Form::select('objective[]', $objectives, reset($objectives),  ['class'=>'form-control selectpicker', 'id' =>'objective0']) }} --}}
336 326
                 </div>
337 327
                 <button type="button" class='btn btn-md btn-primary col-md-1 remove-objective'>
338 328
                   X
@@ -572,7 +562,7 @@ function load_ta_info_for_edit(ta_id) {
572 562
 
573 563
       //set the text box
574 564
       $('#editName').find('input').val(name);
575
-      $('#editDescription').val(description);
565
+      $('#editPanel #description').val(description);
576 566
 
577 567
       //
578 568
       $('#deleteTA').val(ta_id);