diff --git a/src/app/components/noosfero-activities/activity/add_member_in_community.html b/src/app/components/noosfero-activities/activity/add_member_in_community.html index 67c9b23..4ef9adb 100644 --- a/src/app/components/noosfero-activities/activity/add_member_in_community.html +++ b/src/app/components/noosfero-activities/activity/add_member_in_community.html @@ -7,7 +7,7 @@ has joined the community -

+

diff --git a/src/app/components/noosfero-activities/activity/create_article.html b/src/app/components/noosfero-activities/activity/create_article.html index eddf3f3..ae135f1 100644 --- a/src/app/components/noosfero-activities/activity/create_article.html +++ b/src/app/components/noosfero-activities/activity/create_article.html @@ -10,7 +10,7 @@ -

+

diff --git a/src/app/components/noosfero-activities/activity/new_friendship.html b/src/app/components/noosfero-activities/activity/new_friendship.html index e237ad9..a933ffa 100644 --- a/src/app/components/noosfero-activities/activity/new_friendship.html +++ b/src/app/components/noosfero-activities/activity/new_friendship.html @@ -12,7 +12,7 @@ -

+

diff --git a/src/app/components/noosfero-articles/article/article.html b/src/app/components/noosfero-articles/article/article.html index 2019696..8175df2 100644 --- a/src/app/components/noosfero-articles/article/article.html +++ b/src/app/components/noosfero-articles/article/article.html @@ -6,7 +6,7 @@
- + diff --git a/src/app/components/noosfero-blocks/recent-documents/recent-documents.html b/src/app/components/noosfero-blocks/recent-documents/recent-documents.html index 0c5f80f..1421cfe 100644 --- a/src/app/components/noosfero-blocks/recent-documents/recent-documents.html +++ b/src/app/components/noosfero-blocks/recent-documents/recent-documents.html @@ -8,7 +8,7 @@
- +
diff --git a/src/app/components/noosfero/date-format/date-format.filter.spec.ts b/src/app/components/noosfero/date-format/date-format.filter.spec.ts new file mode 100644 index 0000000..2d9ff18 --- /dev/null +++ b/src/app/components/noosfero/date-format/date-format.filter.spec.ts @@ -0,0 +1,19 @@ +import {quickCreateComponent} from "../../../../spec/helpers"; +import {DateFormat} from './date-format.filter'; + +describe("Filters", () => { + describe("Date Format Filter", () => { + + beforeEach(angular.mock.module("templates")); + + it("convert date from the format returned by noosfero api to an ISO format", done => { + let date = "2016/03/10 10:46:47"; + let htmlTemplate = `{{ '${date}' | dateFormat }}`; + quickCreateComponent({ providers: [DateFormat], template: htmlTemplate }).then(fixture => { + expect(fixture.debugElement.text()).toEqual('"2016-03-10T13:46:47.000Z"'); + done(); + }); + }); + + }); +}); diff --git a/src/app/components/noosfero/date-format/date-format.filter.ts b/src/app/components/noosfero/date-format/date-format.filter.ts new file mode 100644 index 0000000..84bc18d --- /dev/null +++ b/src/app/components/noosfero/date-format/date-format.filter.ts @@ -0,0 +1,10 @@ +import {Pipe, Inject} from "ng-forward"; + +@Pipe("dateFormat") +export class DateFormat { + + transform(date: string, options: any) { + return moment(date, "YYYY/MM/DD HH:mm:ss"); + } + +} diff --git a/src/app/main/main.component.ts b/src/app/main/main.component.ts index fde107f..633eece 100644 --- a/src/app/main/main.component.ts +++ b/src/app/main/main.component.ts @@ -12,6 +12,7 @@ import {ProfileImageBlock} from "../components/noosfero-blocks/profile-image-blo import {MembersBlock} from "../components/noosfero-blocks/members-block/members-block.component"; import {NoosferoTemplate} from "../components/noosfero/noosfero-template.filter"; +import {DateFormat} from "../components/noosfero/date-format/date-format.filter"; import {AuthService} from "./../components/auth/auth_service"; import {Session} from "./../components/auth/session"; @@ -37,7 +38,7 @@ export class MainContent { directives: [ ArticleBlog, ArticleView, Boxes, Block, LinkListBlock, MainBlock, RecentDocumentsBlock, Navbar, ProfileImageBlock, - MembersBlock, NoosferoTemplate + MembersBlock, NoosferoTemplate, DateFormat ], providers: [AuthService, Session] }) -- libgit2 0.21.2