test

Yarik
1 parent 20a22bc7
Showing 2 changed files with 25 additions and 13 deletions Show diff stats
common/models/Job.php
frontend/views/performer/workplace.php
@@ -45,13 +45,15 @@ class Job extends \yii\db\ActiveRecord
     public function getExpTime()
     {
-        if($this->date_end){
+        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))));
+        } elseif($this->date_start) {
+            $now = new \DateTime();
+            $date = new \DateTime(date('Y-m-d H:i:s', strtotime($this->date_start)));
+            return \Yii::$app->formatter->asRelativeTime($date->diff(new \DateTime()));
         } else {
-            $now = new \DateTime('now');
-            $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', $now))));
+            return 'неизвестна дата начала';
         }
     }
 <?php
+    /**
+     * @var yii\web\View $this
+     * @var User         $user
+     */
+    use common\models\User;
-use \yii\helpers\Html;
-
-/* @var $this yii\web\View */
-$this->params['user'] = $user;
-$this->title = 'My Yii Application';
+    $this->params[ 'user' ] = $user;
+    $this->title = 'My Yii Application';
 ?>
 <div class="performer-vacancy-vacant-title-reclam-wr style">
     <div class="workplace-wr">
         <div class="workplace-title style"><p>Опыт работы</p></div>
         <div class="workplace-experience-wr style">
-
-            <?php foreach($user->jobs as $job):?>
+            <?php foreach($user->jobs as $job): ?>
                 <div class="workplace-experience-post">
                     <div class="workplace-experience-post-title"><?= $job->name ?></div>
-                    <div class="workplace-experience-post-date"><?= $job->date_start ?>-<?= $job->date_end ?> (<?= $job->expTime ?>)</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;
+                        }
+                        ?>
+                    </div>
                     <div class="workplace-experience-post-vacancy"><?= $job->position ?></div>
                 </div>
             <?php endforeach; ?>
-
         </div>
     </div>
 </div>
 \ No newline at end of file