Skip to content

Commit 9a18fcf

Browse files
we-kamal-s001we-kamal-s001
committed
update: migration/seed time
1 parent a474b9c commit 9a18fcf

File tree

10 files changed

+169
-5
lines changed

10 files changed

+169
-5
lines changed

‎Entities/TenantApp.php

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?php namespace VaahCms\Modules\Saas\Entities;
22

33
use Carbon\Carbon;
4+
use Illuminate\Database\Eloquent\Casts\Attribute;
45
use Illuminate\Database\Eloquent\Model;
56
use Illuminate\Database\Eloquent\SoftDeletes;
67
use Illuminate\Support\Str;
@@ -73,6 +74,24 @@ public function deletedByUser()
7374
)->select('id', 'uuid', 'first_name', 'last_name', 'email');
7475
}
7576
//-------------------------------------------------
77+
protected function lastMigratedAt(): Attribute
78+
{
79+
return Attribute::make(
80+
get: function (string $value = null) {
81+
return self::getUserTimezoneDate($value);
82+
},
83+
);
84+
}
85+
//-------------------------------------------------
86+
protected function lastSeededAt(): Attribute
87+
{
88+
return Attribute::make(
89+
get: function (string $value = null) {
90+
return self::getUserTimezoneDate($value);
91+
},
92+
);
93+
}
94+
//-------------------------------------------------
7695
public function tenant()
7796
{
7897
return $this->belongsTo(Tenant::class,

‎Vue/pages/apps/partials/ListLargeView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454

5555

5656
<b-table-column v-slot="props" width="15%" field="updated_at" label="Updated At">
57-
{{ $vaah.fromNow(props.row.updated_at) }}
57+
{{ localTimeShortFormat(props.row.updated_at) }}
5858
</b-table-column>
5959

6060

‎Vue/pages/apps/partials/ListLargeViewJs.js

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,35 @@ export default {
8585

8686
this.$vaah.console(data, 'copied data');
8787

88+
},
89+
//---------------------------------------------------------------------
90+
91+
//---------------------------------------------------------------------
92+
localTimeShortFormat: function (value) {
93+
94+
const utcTime = new Date(value)
95+
96+
const date = utcTime.getDate();
97+
const dateYear = utcTime.getFullYear();
98+
99+
const current = new Date()
100+
101+
const currentDate = current.getDate();
102+
const currentYear = current.getFullYear();
103+
104+
if (date === currentDate) {
105+
return utcTime.toLocaleTimeString();
106+
} else if (dateYear === currentYear) {
107+
108+
return utcTime.toLocaleString('default', { month: 'short' })+
109+
' '+utcTime.getDate();
110+
} else {
111+
return utcTime.toLocaleString('default', { month: 'short' })+
112+
' '+utcTime.getDate()+
113+
' '+utcTime.getFullYear();
114+
}
115+
116+
88117
},
89118
//---------------------------------------------------------------------
90119
hasPermission: function(slug)

‎Vue/pages/servers/partials/ListLargeView.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</b-table-column>
4141

4242
<b-table-column v-slot="props" width="15%" field="updated_at" label="Updated At">
43-
{{ $vaah.fromNow(props.row.updated_at) }}
43+
{{localTimeShortFormat(props.row.updated_at) }}
4444
</b-table-column>
4545

4646

‎Vue/pages/servers/partials/ListLargeViewJs.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,34 @@ export default {
8787

8888
},
8989
//---------------------------------------------------------------------
90+
localTimeShortFormat: function (value) {
91+
92+
const utcTime = new Date(value)
93+
94+
const date = utcTime.getDate();
95+
const dateYear = utcTime.getFullYear();
96+
97+
const current = new Date()
98+
99+
const currentDate = current.getDate();
100+
const currentYear = current.getFullYear();
101+
102+
if (date === currentDate) {
103+
return utcTime.toLocaleTimeString();
104+
} else if (dateYear === currentYear) {
105+
106+
return utcTime.toLocaleString('default', { month: 'short' })+
107+
' '+utcTime.getDate();
108+
} else {
109+
return utcTime.toLocaleString('default', { month: 'short' })+
110+
' '+utcTime.getDate()+
111+
' '+utcTime.getFullYear();
112+
}
113+
114+
115+
},
116+
//---------------------------------------------------------------------
117+
90118
hasPermission: function(slug)
91119
{
92120
return this.$vaah.hasPermission(this.permissions, slug);

‎Vue/pages/tenantapps/partials/ListLargeView.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@
4646
</b-button>
4747
</b-tooltip>
4848
</b-table-column>
49-
5049
<b-table-column v-slot="props" width="15%" field="updated_at" label="Updated At">
51-
{{ $vaah.fromNow(props.row.updated_at) }}
50+
51+
{{ localTimeShortFormat(props.row.updated_at) }}
5252
</b-table-column>
5353

5454

‎Vue/pages/tenantapps/partials/ListLargeViewJs.js

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,33 @@ export default {
8686

8787
this.$vaah.console(data, 'copied data');
8888

89+
},
90+
//---------------------------------------------------------------------
91+
localTimeShortFormat: function (value) {
92+
93+
const utcTime = new Date(value)
94+
95+
const date = utcTime.getDate();
96+
const dateYear = utcTime.getFullYear();
97+
98+
const current = new Date()
99+
100+
const currentDate = current.getDate();
101+
const currentYear = current.getFullYear();
102+
103+
if (date === currentDate) {
104+
return utcTime.toLocaleTimeString();
105+
} else if (dateYear === currentYear) {
106+
107+
return utcTime.toLocaleString('default', { month: 'short' })+
108+
' '+utcTime.getDate();
109+
} else {
110+
return utcTime.toLocaleString('default', { month: 'short' })+
111+
' '+utcTime.getDate()+
112+
' '+utcTime.getFullYear();
113+
}
114+
115+
89116
},
90117
//---------------------------------------------------------------------
91118
hasPermission: function(slug)

‎Vue/pages/tenants/partials/ListLargeView.vue

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,12 @@
5151
</b-table-column>
5252

5353
<b-table-column v-slot="props" width="15%" field="updated_at" label="Updated At">
54-
{{ $vaah.fromNow(props.row.updated_at) }}
54+
55+
56+
{{ localTimeShortFormat(props.row.updated_at) }}
57+
58+
59+
5560
</b-table-column>
5661

5762

‎Vue/pages/tenants/partials/ListLargeViewJs.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,34 @@ export default {
9595
this.$router.push({name: 'tenantapps.list', query:{search_by:'tenent',q:item.name}})
9696
},
9797
//---------------------------------------------------------------------
98+
99+
//---------------------------------------------------------------------
100+
localTimeShortFormat: function (value) {
101+
102+
const utcTime = new Date(value)
103+
104+
const date = utcTime.getDate();
105+
const dateYear = utcTime.getFullYear();
106+
107+
const current = new Date()
108+
109+
const currentDate = current.getDate();
110+
const currentYear = current.getFullYear();
111+
112+
if (date === currentDate) {
113+
return utcTime.toLocaleTimeString();
114+
} else if (dateYear === currentYear) {
115+
116+
return utcTime.toLocaleString('default', { month: 'short' })+
117+
' '+utcTime.getDate();
118+
} else {
119+
return utcTime.toLocaleString('default', { month: 'short' })+
120+
' '+utcTime.getDate()+
121+
' '+utcTime.getFullYear();
122+
}
123+
124+
125+
},
98126
//---------------------------------------------------------------------
99127
//---------------------------------------------------------------------
100128
//---------------------------------------------------------------------

‎Vue/store/modules/root.js

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,34 @@ export default {
6767
}
6868

6969
},
70+
//---------------------------------------------------------------------
71+
localTimeShortFormat: function (value) {
72+
73+
const utcTime = new Date(value)
74+
75+
const date = utcTime.getDate();
76+
const dateYear = utcTime.getFullYear();
77+
78+
const current = new Date()
79+
80+
const currentDate = current.getDate();
81+
const currentYear = current.getFullYear();
82+
83+
if (date === currentDate) {
84+
return utcTime.toLocaleTimeString();
85+
} else if (dateYear === currentYear) {
86+
87+
return utcTime.toLocaleString('default', { month: 'short' })+
88+
' '+utcTime.getDate();
89+
} else {
90+
return utcTime.toLocaleString('default', { month: 'short' })+
91+
' '+utcTime.getDate()+
92+
' '+utcTime.getFullYear();
93+
}
94+
95+
96+
},
97+
7098
//-----------------------------------------------------------------
7199
reloadAssets: function ({ state, commit, dispatch, getters }) {
72100
let payload = {

0 commit comments

Comments
 (0)