Merge branch 'feature/swvMaaktSopSchool' into develop

application/views/monpas/compactsop/maaksoponderdelen/knoppenbalk.php

@@ -10,6 +10,16 @@
                 </select>
             </td>
 
+            <td style="padding-left: 30px;" data-bind="visible: toporgnr() != 4 ">
+                <p>Organisatie:</p>
+                <select data-bind="     options: organisaties,
+                                        optionsText:  'naamkort',
+                                        value: $root.selectedOrganisatie,
+                                        event: {change: fGetCompactSop}" >
+                </select>
+            </td>
+
+
             <td style="vertical-align: bottom; ">
                 <button class="buttonCompact"
                         style="background-color:  #1aa3ff; margin-left: 30px; "

application/views/monpas/modals/school_modal.php

@@ -11,9 +11,9 @@
             </div>
 
             <div class="modal-body">
-                <table style="width: 90%;" data-bind="foreach: $root.school">
+                <table style="width: 90%;" data-bind="with: $root.schoolasobsject">
                     <tr >
-                        <td style="width: 20%" data-bind="text: $root.orgsoort() "></td>
+                        <td style="width: 20%" data-bind="text: $root.orgsoort "></td>
                         <td style="width: 30%" data-bind="text: naam"></td>
                         <td style="width: 20%" >Adres</td>
                         <td style="width: 30%">