Course Article Page

www/application/classes/Controller/Admin.php

@@ -204,11 +204,27 @@ public function scripts_resetArticlesTimeline()
             $articles[$key] = $article;
         }
 
+        $courses = Model_Courses::getActiveCoursesWithArticles();
+
+        /** rebuld array*/
+        foreach ($courses as $key => $value) {
+            $course = array(
+                'id' => $courses[$key]->id,
+                'dt_create' => $courses[$key]->dt_publish,
+            );
+            $courses[$key] = $course;
+        }
+
         // #TODO add to $feed array with courses later
-        $feed = new Model_Feed_Articles('article');
-        $feed->clear();
-        $feed->init($articles);
+        $feed_articles = new Model_Feed_Articles('article');
+        $feed_courses = new Model_Feed_Articles('course');
+
+        $feed_articles->clear();
+        $feed_courses->clear();
+
+        $feed_articles->init($articles);
+        $feed_courses->init($courses);
 
-        return 'Articles timeline was successfully updated';
+        return 'Articles and Courses timeline was successfully updated';
     }
 }

www/application/classes/Controller/Articles/Index.php

@@ -104,8 +104,14 @@ public function action_show()
      */
     public function getFeed()
     {
-        $feed = new Model_Feed_Articles();
-        $feed_items  = $feed->get();
+        $articles = new Model_Feed_Articles();
+        $article_items  = $articles->get();
+
+        $courses = new Model_Courses();
+        $course_items  = $courses->getActiveCoursesWithArticles();
+
+        $feed_items = array_merge($article_items, $course_items);
+
         foreach ($feed_items as $feed_item) {
             $coauthorship        = new Model_Coauthors($feed_item->id);
             $feed_item->coauthor = Model_User::get($coauthorship->user_id);

www/application/classes/Model/Courses.php

@@ -15,6 +15,8 @@ class Model_Courses extends Model
     public $description;
     public $cover;
     public $is_big_cover;
+    public $course_articles = [];
+    public $course_authors = [];
     public $dt_publish;
     public $dt_create;
     public $dt_update;
@@ -73,14 +75,22 @@ public function insert()
      */
     private function fillByRow($course_row)
     {
-        if (empty($course_row['id'])) {
-            return $this;
-        }
-
-        foreach ($course_row as $fieldname => $value) {
-            if (property_exists($this, $fieldname)) {
-                $this->$fieldname = $value;
-            }
+        if (!empty($course_row['id'])) {
+            $this->id              = Arr::get($course_row, 'id');
+            $this->uri             = Arr::get($course_row, 'uri');
+            $this->title           = Arr::get($course_row, 'title');
+            $this->text            = Arr::get($course_row, 'text');
+            $this->description     = Arr::get($course_row, 'description');
+            $this->cover           = Arr::get($course_row, 'cover');
+            $this->is_big_cover    = Arr::get($course_row, 'is_big_cover');
+            $this->marked          = Arr::get($course_row, 'marked');
+            $this->dt_publish      = Arr::get($course_row, 'dt_publish');
+            $this->dt_create       = Arr::get($course_row, 'dt_create');
+            $this->dt_update       = Arr::get($course_row, 'dt_update');
+            $this->is_removed      = Arr::get($course_row, 'is_removed');
+            $this->is_published    = Arr::get($course_row, 'is_published');
+            $this->course_articles = self::getArticlesFromCourseWithCoauthors($this->id);
+            $this->course_authors  = self::getUniqueCourseAuthors($this->course_articles);
         }
 
         return $this;
@@ -222,6 +232,24 @@ public static function getActiveCourses($clearCache = false)
         return Model_Courses::getCourses(false, false, !$clearCache ? Date::MINUTE * 5 : null);
     }
 
+    /**
+     * Получить все опубликованные курсы, которые содержат хотя бы одну статью
+     *
+     * @return Model_Courses[] - экземпляр модели с указанным идентификатором и заполненными полями
+     */
+    public static function getActiveCoursesWithArticles($clearCache = false)
+    {
+        $courses = Model_Courses::getCourses(false, false, !$clearCache ? Date::MINUTE * 5 : null);
+        $courses_with_articles = array();
+
+        foreach ($courses as $course) {
+            if (self::getArticles($course->id)) {
+                $courses_with_articles[] = $course;
+            }
+        }
+
+        return $courses_with_articles;
+    }
 
     /**
      * Получить все неудалённые курсы в порядке убывания ID.
@@ -297,4 +325,63 @@ public static function getArticles($course_id)
 
         return Dao_CoursesArticles::select('article_id')->where('course_id', '=', $course_id)->execute();
     }
+
+    /**
+     * Get Articles from Course
+     * @param [int] $courseId  - ID of Course
+     * @return Model_Article[] - Array of Articles
+     */
+    public static function getArticlesFromCourse($courseId)
+    {
+        /** getting all articles from course */
+        $course_articles = self::getArticles($courseId);
+
+        /** $articleList - empty array. Needs to fill by article ids */
+        $articleList = array();
+
+        if ($course_articles) {
+            foreach ($course_articles as $articles) {
+                $articleList[] = Model_Article::get($articles['article_id']);
+            }
+        }
+
+        return $articleList;
+    }
+
+    /**
+     * Get articles from course with coauthors
+     * @return Model_Article[]
+     */
+    public function getArticlesFromCourseWithCoauthors($courseId)
+    {
+        $course_articles = self::getArticlesFromCourse($courseId);
+
+        foreach ($course_articles as $course_article) {
+            $coauthorship        = new Model_Coauthors($course_article->id);
+            $course_article->coauthor = Model_User::get($coauthorship->user_id);
+        }
+        return $course_articles;
+    }
+
+     /**
+     * Return unique article authors from the Course
+     * @param  Model_Article[] - Articles included in specific Course
+     * @return Model_User[]    - Array of unique Course authors
+     */
+    public static function getUniqueCourseAuthors($course_articles)
+    {
+        $course_authors_ids = array();
+        $course_authors     = array();
+
+        foreach ($course_articles as $article) {
+            $author_id = $article->author->id;
+
+            if (!in_array($author_id, $course_authors_ids))
+            {
+                $course_authors_ids[] = $author_id;
+                $course_authors[] = Model_User::get($author_id);
+            }
+        }
+        return $course_authors;
+    }
 }

www/application/views/templates/articles/article.php

@@ -1,34 +1,14 @@
-<div class="center_side clear">
+<div class="center_side clear course-menu--top">
     <? if (isset($articlesFromCourse)): ?>
         <?= View::factory('templates/articles/course_list')
             ->set('articles', $articlesFromCourse)
+            ->set('mobileToggleClass', 'course-menu__title--toggle js-course-menu__title--toggle')
+            ->set('currentArticle', $article)
             ->set('course', $course)
         ?>
     <? endif; ?>
 </div>
 
-<? if (isset($previousArticle)): ?>
-    <div class="course-navigation-wrapper course-navigation-wrapper--previous" name="js-course-navigation">
-        <a class="course-navigation course-navigation--previous" href="<?= URL::site($previousArticle->uri ?: '/article/' . $previousArticle->id) ?>">
-            <div class="course-navigation__icon course-navigation__icon--previous"></div>
-            <div class="course-navigation__title"><?= HTML::chars($previousArticle->title) ?></div>
-            <img class="course-navigation__avatar" src="<?= $previousArticle->author->photo ?>" itemprop="image">
-            <div class="course-navigation__author"><?= HTML::chars($previousArticle->author->name) ?></div>
-        </a>
-    </div>
-<? endif; ?>
-
-<? if (isset($nextArticle)): ?>
-    <div class="course-navigation-wrapper course-navigation-wrapper--next" name="js-course-navigation">
-        <a class="course-navigation course-navigation--next" href="<?=URL::site($nextArticle->uri ?: '/article/' . $nextArticle->id); ?>">
-            <div class="course-navigation__icon course-navigation__icon--next"></div>
-            <div class="course-navigation__title"><?= HTML::chars($nextArticle->title) ?></div>
-            <img class="course-navigation__avatar" src="<?= $nextArticle->author->photo ?>" itemprop="image">
-            <div class="course-navigation__author"><?= HTML::chars($nextArticle->author->name) ?></div>
-        </a>
-    </div>
-<? endif; ?>
-
 <article class="article" itemscope itemtype="http://schema.org/Article">
 
     <script type="application/ld+json">
@@ -174,6 +154,35 @@
 
     </div>
 
+    <? if (isset($previousArticle) || isset($nextArticle)): ?>
+        <div class="center_side clear course-navigation-wrapper">
+            <div class="course-navigation" name="js-course-navigation">
+                <? if (isset($previousArticle)): ?>
+                    <a class="course-navigation__item course-navigation__item--previous" href="<?= URL::site($previousArticle->uri ?: '/article/' . $previousArticle->id) ?>">
+                        <?= HTML::chars($previousArticle->title) ?>
+                    </a>
+                <? endif; ?>
+
+                <? if (isset($nextArticle)): ?>
+                    <a class="course-navigation__item course-navigation__item--next" href="<?=URL::site($nextArticle->uri ?: '/article/' . $nextArticle->id); ?>">
+                        <?= HTML::chars($nextArticle->title) ?>
+                    </a>
+                <? endif; ?>
+            </div>
+        </div>
+    <? endif; ?>
+
+    <div class="center_side clear">
+        <? if (isset($articlesFromCourse)) : ?>
+            <?=View::factory('templates/articles/course_list')
+                ->set('articles', $articlesFromCourse)
+                ->set('mobileToggleClass', '')
+                ->set('currentArticle', $article)
+                ->set('course', $course)
+            ?>
+        <? endif; ?>
+    </div>
+
     <? if(!empty($quiz)): ?>
         <?= View::factory('templates/quizzes/quiz', array('quizData' => $quiz->quiz_data)); ?>
     <? endif ?>
@@ -200,12 +209,12 @@
 
 </article>
 
+<script>
 
-<div class="center_side clear">
-    <? if (isset($articlesFromCourse)) : ?>
-        <?=View::factory('templates/articles/course_list')
-            ->set('articles', $articlesFromCourse)
-            ->set('course', $course)
-        ?>
-    <? endif; ?>
-</div>
+    codex.docReady(function () {
+
+        codex.courses.toggleCourse();
+
+    });
+
+</script>

www/application/views/templates/articles/course_articles.php

@@ -0,0 +1,14 @@
+<? if ($articlesFromCourse) : ?>
+
+    <ul class="course-menu-list">
+        <? foreach ($articlesFromCourse as $article) : ?>
+            <li class="course-menu-list__item">
+                <a href="<?=URL::site( '/article/ ' . $article->id ); ?>" class="course-menu-list__link course-menu-list__link--black">
+                    <?= $article->title; ?>
+                    <div class="course-menu-list__item-label"></div>
+                </a>
+            </li>
+        <? endforeach; ?>
+    </ul>
+
+<? endif; ?>

www/application/views/templates/articles/course_list.php

@@ -1,12 +1,22 @@
-<section class="course">
+<section class="course-menu">
 
-    <h2 class="course__title"><?=$course->title; ?></h2>
+    <h2 class="course-menu__title <?= $mobileToggleClass ?>">
+        <a href="<?= "/course/" . $course->id ?>">
+            <?=$course->title; ?>
+        </a>
+    </h2>
 
     <? if (!empty($articles)) : ?>
-        <ul class="courses-list">
+        <ul class="course-menu-list js-course-menu-list">
             <? foreach ($articles as $article) : ?>
-                <li class="courses-list__item">
-                    <a href="<?=URL::site($article->uri ?: '/article/ ' . $article->id ); ?>" class="courses-list__link" href=""><?=$article->title; ?></a>
+                <?
+                    $isCurrent = $article->id == $currentArticle->id;
+                ?>
+                <li class="course-menu-list__item <?= $isCurrent ? 'course-menu-list__item--current' : '' ?>">
+                    <a href="<?=URL::site($article->uri ?: '/article/ ' . $article->id ); ?>" class="course-menu-list__link">
+                        <?= $article->title; ?>
+                        <div class="course-menu-list__item-label"></div>
+                    </a>
                 </li>
             <? endforeach; ?>
         </ul>

www/application/views/templates/articles/feed_list_item.php

@@ -0,0 +1,69 @@
+<article class="feed-item clearfix <?= $item->marked ? 'feed-item--big' : ''?> <?= $item->cover ? 'feed-item--with-cover' : '' ?><?= $item->is_big_cover ? ' feed-item--with-big-cover' : ''?>" data-type="<?= $item::FEED_PREFIX; ?>" data-id="<?= HTML::chars($item->id); ?>">
+
+    <?
+        $url = $item->uri ?: 'article/' . $item->id;
+    ?>
+
+    <? if ($item::FEED_PREFIX == 'course'): ?>
+        <?
+            $articlesFromCourse = $item->course_articles;
+            $courseAuthors = $item->course_authors;
+
+            if ($articlesFromCourse) {
+                $item->author = $courseAuthors[0];
+            }
+
+            if (count($courseAuthors) > 1) {
+                $item->coauthor = $courseAuthors[count($courseAuthors) - 1];
+            }
+        ?>
+    <? endif; ?>
+
+    <? if ($item->cover): ?>
+        <a class="feed-item__cover" href="<?= HTML::chars($url) ?>">
+            <img src="<?= HTML::chars($item->cover) ?>">
+        </a>
+    <? endif; ?>
+
+    <a class="feed-item__title js-emoji-included" href="/<?= HTML::chars($url)  ?>">
+        <?= HTML::chars($item->title) ?>
+    </a>
+
+    <? if ($item::FEED_PREFIX == 'article'): ?>
+
+        <div class="feed-item__description">
+            <?= HTML::chars($item->description) ?>
+        </div>
+
+    <? elseif ($item::FEED_PREFIX == 'course'): ?>
+
+        <?= View::factory('templates/articles/course_articles', array( 'articlesFromCourse' => $articlesFromCourse)); ?>
+
+    <? endif; ?>
+
+    <div class="feed-item__info">
+        <time class="feed-item__time">
+            <?= date_format(date_create($item->dt_publish), 'd M Y'); ?>
+        </time>
+
+        <a class="feed-item__author-photo" href="/user/<?= HTML::chars($item->author->id) ?>">
+            <img src="<?= HTML::chars($item->author->photo) ?>" alt="<?= HTML::chars($item->author->name) ?>">
+        </a>
+        <? if ($item->coauthor->id): ?>
+            <a class="feed-item__author-photo" href="/user/<?= HTML::chars($item->coauthor->id) ?>">
+                <img src="<?= HTML::chars($item->coauthor->photo) ?>" alt="<?= HTML::chars($item->coauthor->name) ?>">
+            </a>
+        <? endif; ?>
+
+        <a class="feed-item__author-name" href="/user/<?= HTML::chars($item->author->id) ?>">
+            <?= HTML::chars($item->author->name) ?>
+        </a>
+        <? if ($item->coauthor->id): ?>
+            and <a class="feed-item__author-name" href="/user/<?= HTML::chars($item->coauthor->id) ?>">
+                <?= HTML::chars($item->coauthor->name) ?>
+            </a>
+        <? endif; ?>
+
+    </div>
+
+</article>