Changeset 2752080

Timestamp:

07/05/2022 11:40:38 AM (4 years ago)

Author:

planaday

Message:

6.7

• Optioneel wordt E-learning wel meegeteld als 'dagdeel'

Location:

planaday-api/trunk

Files:

• index.php (modified) (1 diff)
• readme.txt (modified) (1 diff)
• src/api/classes/settings/settings_general.php (modified) (2 diffs)
• src/api/classes/shortcodes.php (modified) (1 diff)
• src/api/classes/shortcodes/shortcodes_course.php (modified) (1 diff)
• src/includes/functions.php (modified) (2 diffs)
• src/includes/migrations/6_7.php (added)

planaday-api/trunk/index.php

@@ -9 +9 @@
  * Plugin URI:        https://planaday.freshdesk.com/support/solutions/articles/11000058859-wordpress-in-website-met-publieke-api
  * Description:       Toon de cursussen van Planaday in een wordpress website. Dit kan middels een lijst, op cursussoort, label of alle cursussen en in verschillende formats met eigen opmaak
- * Version:           6.6
+ * Version:           6.7
  * Author:            Planaday development
  * Author URI:        https://www.planaday.nl

planaday-api/trunk/readme.txt

@@ -107 +107 @@
 
 == Changelog ==
+
+= 6.7 =
+* Optioneel wordt E-learning wel meegeteld als 'dagdeel'
 
 = 6.6 =

planaday-api/trunk/src/api/classes/settings/settings_general.php

@@ -70 +70 @@
                 $valid['geldterugdetail'] = sanitize_text_field($input['geldterugdetail']);
                 $valid['tooncostsremark'] = sanitize_text_field($input['tooncostsremark']);
+                $valid['countelearningasdaypart'] = sanitize_text_field($input['countelearningasdaypart']);
                 $valid['toonniveau'] = sanitize_text_field($input['toonniveau']);
                 $valid['toonomschrijvingdagdeel'] = sanitize_text_field($input['toonomschrijvingdagdeel']);
@@ -1430 +1431 @@
         <tr>
             <th scope="row" class="titelrij">
+                E-learning meetellen?
+            </th>
+            <td>
+                <input type="radio" name="planaday-api-general[countelearningasdaypart]"
+                       value="1" <?php if ($options['countelearningasdaypart'] === '1') {
+                    echo 'checked="checked"';
+                } ?> /> Ja
+                <input type="radio" name="planaday-api-general[countelearningasdaypart]"
+                       value="0" <?php if ($options['countelearningasdaypart'] === '0' || $options['countelearningasdaypart'] === '') {
+                    echo 'checked="checked"';
+                } ?> /> Nee
+                <p class="description" id="planaday-api-countelearningasdaypart">
+                    Moet E-learning meegeteld worden als 'dagdeel'?
+                </p>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row" class="titelrij">
                 Toon afbeelding
                 <span style="text-align: left; color: #ff7700;"><b>Nieuw!</b></span>

planaday-api/trunk/src/api/classes/shortcodes.php

@@ -335 +335 @@
     }
 
+    public function planaday_api_get_amount_dayparts_of_course_without_elearning( $id ) {
+        $client = client::planaday_api_get_instance();
+        $data   = $client->call(
+            $this->_options['url'],
+            $this->_options['key'],
+            sprintf( 'course/%s' . '/dayparts', $id ),
+            []
+        );
+        $teller = 0;
+        if ( isset( $data['data'] ) ) {
+            foreach ( $data['data'] as $value ) {
+                if ($value['is_elearning'] === 0) {
+                    $teller++;
+                }
+            }
+        }
+        return $teller;
+    }
+
     public function planaday_api_get_location( $id ) {
         $url    = $this->_options['url'];

planaday-api/trunk/src/api/classes/shortcodes/shortcodes_course.php

@@ -94 +94 @@
             if ( isset( $this->_options['toondetaildagdelen'] )
                  && $this->_options['toondetaildagdelen'] === '1' ) {
+                if ( isset( $this->_options['countelearningasdaypart'] )
+                    && ($this->_options['countelearningasdaypart'] === '0')  ) {
+                    $daypartscount = shortcodes::planaday_api_get_amount_dayparts_of_course_without_elearning($courseId);
+                } else {
+                    $daypartscount = $data["daypart_amount"];
+                }
                 echo '<div class="pad-detail-amount"><i class="fas fa-recycle fa-fw"></i> ' . __( "Bestaat uit",
-                        "planaday-api" ) . ' ' . $data["daypart_amount"] . ' ' . $this->_options['dagdelentekst'] . '</div>';
+                        "planaday-api" ) . ' ' . $daypartscount . ' ' . $this->_options['dagdelentekst'] . '</div>';
             }
 

planaday-api/trunk/src/includes/functions.php

@@ -242 +242 @@
     }
 
+    if ($pluginVersionDatabase <= '6.6') {
+        require_once(__DIR__ . '/migrations/6_7.php');
+        update6_7();
+        update_option('planaday-api-version', '6.7');
+    }
+
 }
 
@@ -294 +300 @@
 
     reload_courses_dashboard();
+}
+
+function pad_update_option($optionname, $value) {
+    $options = get_option('planaday-api-general');
+    $options[$optionname] = $value;
+    update_option('planaday-api-general', $options);
 }