topic completion percentage

Author: sanjana4khan

models/CourseModel.php

@@ -1466,6 +1466,9 @@ public static function get_topic_progress_by_course_id( $course_id, $student_id
 		foreach ( $topics_query->posts as $topic_post ) {
 			$topic_id = (int) $topic_post->ID;
 
+			$total_topic_items     = 0;
+			$total_topic_items_completed = 0;
+
 			$topic = array(
 				'topic_id'        => $topic_id,
 				'topic_summary'   => $topic_post->post_content,
@@ -1493,8 +1496,6 @@ public static function get_topic_progress_by_course_id( $course_id, $student_id
 							'link'         => esc_url_raw( get_permalink( $post_id ) ),
 							'title'        => $content_post->post_title,
 							'is_completed' => $is_completed,
-							'time_limit'   => tutor_utils()->get_quiz_option( $post_id, 'time_limit.time_value' ),
-							'time_type'    => tutor_utils()->get_quiz_option( $post_id, 'time_limit.time_type' ),
 							'label'        => __( 'Quiz', 'tutor' ),
 							'icon'         => Icon::QUIZ_2,
 						);
@@ -1515,23 +1516,33 @@ public static function get_topic_progress_by_course_id( $course_id, $student_id
 						);
 
 					} elseif ( tutor()->zoom_post_type === $post_type ) {
+
+						$zoom_start_date = get_post_meta($post_id, '_tutor_zm_start_datetime', true);
+						$start_timestamp = $zoom_start_date ? strtotime( $zoom_start_date ) : 0;
+						$is_completed = $start_timestamp && strtotime('now') > $start_timestamp;
 						$topic['items'][] = array(
 							'type'  => 'zoom_meeting',
 							'id'    => $post_id,
 							'title' => $content_post->post_title,
 							'link'  => esc_url_raw( get_permalink( $post_id ) ),
 							'label' => __( 'Live Class', 'tutor' ),
 							'icon'  => Icon::ZOOM,
+							'is_completed' => $is_completed,
 						);
 
 					} elseif ( tutor()->meet_post_type === $post_type ) {
+						$google_end_date = get_post_meta($post_id, 'tutor-google-meet-end-datetime', true);
+						$end_timestamp = $google_end_date ? strtotime( $google_end_date ) : 0;
+						$is_completed = $end_timestamp && strtotime('now') > $end_timestamp;
+
 						$topic['items'][] = array(
 							'type'  => 'google_meet',
 							'id'    => $post_id,
 							'title' => $content_post->post_title,
 							'link'  => esc_url_raw( get_permalink( $post_id ) ),
 							'label' => __( 'Live Class', 'tutor' ),
 							'icon'  => Icon::GOOGLE_MEET,
+							'is_completed' => $is_completed,
 						);
 
 					} else {
@@ -1555,10 +1566,16 @@ public static function get_topic_progress_by_course_id( $course_id, $student_id
 						$topic['topic_completed'] = false;
 					} else {
 						$topic['topic_started'] = true;
+						$total_topic_items_completed++;
 					}
 				}
+
+				$total_topic_items = count($contents_query->posts);
 			}
 
+			$topic['topic_completion_percentage'] = $total_topic_items > 0 && $total_topic_items_completed > 0
+													? (int) round( ( $total_topic_items_completed / $total_topic_items ) * 100)
+													: 0;
 			$topic_list[] = $topic;
 		}