From fd384984b89bc02efc2916c71132f0b9cc41ef8e Mon Sep 17 00:00:00 2001
From: Yarik <kingofdusk@gmail.com>
Date: Wed, 23 Mar 2016 13:46:44 +0200
Subject: [PATCH] test

---
 common/models/Job.php                  | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
 frontend/views/performer/workplace.php | 14 +++++++-------
 2 files changed, 58 insertions(+), 11 deletions(-)

diff --git a/common/models/Job.php b/common/models/Job.php
index d82d374..94865d3 100755
--- a/common/models/Job.php
+++ b/common/models/Job.php
@@ -101,16 +101,63 @@
                 $start = new \DateTime($this->date_start);
                 $end =  new \DateTime($this->date_end);
                 $interval = $end->diff($start);
-                if(!empty($interval->y)) {
-                    if($interval->y) {
-                        $result
+                if($interval->y > 0) {
+                    if($interval->y == 1) {
+                        $result .= $interval->y.' год';
+                    } elseif($interval->y > 1 && $interval->y <= 4) {
+                        $result .= $interval->y.' года';
+                    } else {
+                        $result .= $interval->y.' лет';
                     }
                 }
+                if($interval->m > 0) {
+                    if(!empty($result)) {
+                        $result .= ', ';
+                    }
+                    if($interval->m == 1) {
+                        $result .= $interval->m.' месяц';
+                    } elseif($interval->m > 1 && $interval->m <= 4) {
+                        $result .= $interval->m.' месяца';
+                    } else {
+                        $result .= $interval->m.' месяцев';
+                    }
+                }
+                if(empty($result) && $interval->d > 0) {
+                    $result = 'Меньше месяца';
+                }
             } elseif(!empty($this->date_start)) {
-
+                $result = '';
+                $start = new \DateTime($this->date_start);
+                $end =  new \DateTime();
+                $interval = $end->diff($start);
+                if($interval->y > 0) {
+                    if($interval->y == 1) {
+                        $result .= $interval->y.' год';
+                    } elseif($interval->y > 1 && $interval->y <= 4) {
+                        $result .= $interval->y.' года';
+                    } else {
+                        $result .= $interval->y.' лет';
+                    }
+                }
+                if($interval->m > 0) {
+                    if(!empty($result)) {
+                        $result .= ', ';
+                    }
+                    if($interval->m == 1) {
+                        $result .= $interval->m.' месяц';
+                    } elseif($interval->m > 1 && $interval->m <= 4) {
+                        $result .= $interval->m.' месяца';
+                    } else {
+                        $result .= $interval->m.' месяцев';
+                    }
+                }
+                if(empty($result) && $interval->d > 0) {
+                    $result = 'Меньше месяца';
+                }
             } else {
                 return false;
             }
+            return $result;
 //            if($this->date_end && $this->date_start) {
 //                $date = new \DateTime(date('Y-m-d H:i:s', $this->date_start));
 //                return \Yii::$app->formatter->asRelativeTime($date->diff(new \DateTime(date('Y-m-d H:i:s', $this->date_end))));
diff --git a/frontend/views/performer/workplace.php b/frontend/views/performer/workplace.php
index 73a220f..f44321c 100755
--- a/frontend/views/performer/workplace.php
+++ b/frontend/views/performer/workplace.php
@@ -17,13 +17,13 @@
                     <div class="workplace-experience-post-title"><?= $job->name ?></div>
                     <div class="workplace-experience-post-date">
                         <?php
-                        if(!empty($job->date_start) && !empty($job->date_end)) {
-                            echo $job->date_start . '-' . $job->date_end . ' (' . $job->expTime . ')';
-                        } elseif(!empty($job->date_start)) {
-                            echo 'с ' . $job->date_start . ' (' . $job->expTime . ')';
-                        } elseif(!empty($job->date_end)) {
-                            echo 'до ' . $job->date_end;
-                        }
+                            if(!empty( $job->date_start ) && !empty( $job->date_end )) {
+                                echo \Yii::$app->formatter->asDate(strtotime($job->date_start), 'php:d.m.Y') . ' - ' . \Yii::$app->formatter->asDate(strtotime($job->date_end), 'php:d.m.Y') . ' (' . $job->expTime . ')';
+                            } elseif(!empty( $job->date_start )) {
+                                echo 'с ' . \Yii::$app->formatter->asDate(strtotime($job->date_start), 'php:d.m.Y') . ' (' . $job->expTime . ')';
+                            } elseif(!empty( $job->date_end )) {
+                                echo 'до ' . \Yii::$app->formatter->asDate(strtotime($job->date_end), 'php:d.m.Y');
+                            }
                         ?>
                     </div>
                     <div class="workplace-experience-post-vacancy"><?= $job->position ?></div>
--
libgit2 0.21.4