Meetup

DevActivator.Common.BL/Config/CityTimeZone.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using DevActivator.Common.BL.Enums;
+
+namespace DevActivator.Common.BL.Config
+{
+    public static class CityTimeZone
+    {
+        public static TimeSpan GetTimeZone(this City city) => TimeZoneDic[city];
+
+        private static readonly Dictionary<City, TimeSpan> TimeZoneDic = new Dictionary<City, TimeSpan>
+        {
+            {City.Spb, TimeSpan.FromHours(3)},
+            {City.Msk, TimeSpan.FromHours(3)},
+            {City.Sar, TimeSpan.FromHours(4)},
+            {City.Kry, TimeSpan.FromHours(7)},
+            {City.Kzn, TimeSpan.FromHours(3)},
+            {City.Nsk, TimeSpan.FromHours(7)},
+            {City.Nnv, TimeSpan.FromHours(3)},
+            {City.Ufa, TimeSpan.FromHours(5)},
+        };
+    }
+}

DevActivator.Meetups.BL/Enums/City.cs → DevActivator.Common.BL/Enums/City.cs

@@ -1,4 +1,4 @@
-namespace DevActivator.Meetups.BL.Enums
+namespace DevActivator.Common.BL.Enums
 {
     public enum City
     {
@@ -18,6 +18,12 @@ public enum City
         Kzn = 5,
 
         /// <summary> Новосибирск </summary>
-        Nsk = 6
+        Nsk = 6,
+
+        /// <summary> Нижний Новгород </summary>
+        Nnv = 7,
+
+        /// <summary> Уфа </summary>
+        Ufa = 8
     }
 }

DevActivator.Common.BL/Extensions/StringExtension.cs

@@ -0,0 +1,11 @@
+using System;
+using DevActivator.Common.BL.Enums;
+
+namespace DevActivator.Common.BL.Extensions
+{
+    public static class StringExtension
+    {
+        public static City GetCity(this string id)
+            => (City) Enum.Parse(typeof(City), id.Substring(0, 3), true);
+    }
+}

DevActivator.Meetups.BL/Entities/Meetup.cs

@@ -12,17 +12,11 @@ public class Meetup : IFlatEntity
 
         public string CommunityId { get; set; }
 
-        /// <summary> Obsolete </summary>
-        public string Date { get; set; }
-
         [XmlArrayItem("FriendId")]
         public List<string> FriendIds { get; set; }
 
         public string VenueId { get; set; }
 
         public List<Session> Sessions { get; set; }
-
-        [XmlArrayItem("TalkId")]
-        public List<string> TalkIds { get; set; }
     }
 }

DevActivator.Meetups.BL/Enums/Community.cs

@@ -7,6 +7,8 @@ public enum Community
         SarDotNet = 3,
         KryDotNet = 4,
         KznDotNet = 5,
-        NskDotNet = 6
+        NskDotNet = 6,
+        NnvDotNet = 7,
+        UfaDotNet = 8
     }
 }

DevActivator.Meetups.BL/Extensions/MeetupExtensions.cs

@@ -1,5 +1,8 @@
 using System;
+using System.Globalization;
 using System.Linq;
+using DevActivator.Common.BL.Config;
+using DevActivator.Common.BL.Extensions;
 using DevActivator.Meetups.BL.Entities;
 using DevActivator.Meetups.BL.Enums;
 using DevActivator.Meetups.BL.Models;
@@ -44,11 +47,12 @@ public static MeetupVm ToVm(this Meetup meetup)
                 CommunityId = meetup.CommunityId.GetCommunity(),
                 FriendIds = meetup.FriendIds.Select(x => new FriendReference {FriendId = x}).ToList(),
                 VenueId = meetup.VenueId,
-                Sessions = meetup.Sessions.Select(x => new Session
+                Sessions = meetup.Sessions.Select(x => new SessionVm
                 {
                     TalkId = x.TalkId,
-                    StartTime = x.StartTime,
-                    EndTime = x.EndTime
+                    // todo: extract as helper method
+                    StartTime = x.StartTime.Add(meetup.VenueId.GetCity().GetTimeZone()).ToString("yyyy-MM-ddTHH:mm:ss"),
+                    EndTime = x.EndTime.Add(meetup.VenueId.GetCity().GetTimeZone()).ToString("yyyy-MM-ddTHH:mm:ss")
                 }).ToList(),
             };
 
@@ -63,13 +67,23 @@ public static Meetup Extend(this Meetup original, MeetupVm meetup)
                 Sessions = meetup.Sessions.Select(x => new Session
                 {
                     TalkId = x.TalkId,
-                    StartTime = x.StartTime,
-                    EndTime = x.EndTime
+                    // todo: extract as helper method
+                    StartTime = DateTime.ParseExact(
+                            $"{x.StartTime}Z",
+                            "yyyy-MM-ddTHH:mm:ssZ",
+                            CultureInfo.InvariantCulture,
+                            DateTimeStyles.AdjustToUniversal)
+                        .Subtract(meetup.VenueId.GetCity().GetTimeZone()),
+                    EndTime = DateTime.ParseExact(
+                            $"{x.EndTime}Z",
+                            "yyyy-MM-ddTHH:mm:ssZ",
+                            CultureInfo.InvariantCulture,
+                            DateTimeStyles.AdjustToUniversal)
+                        .Subtract(meetup.VenueId.GetCity().GetTimeZone())
                 }).ToList(),
-                TalkIds = meetup.Sessions.Select(x => x.TalkId).ToList(),
             };
 
-        private static Community GetCommunity(this string id)
+        public static Community GetCommunity(this string id)
             => (Community) Enum.Parse(typeof(Community), id, true);
     }
 }

DevActivator.Meetups.BL/Extensions/VenueExtensions.cs

@@ -1,6 +1,6 @@
 using System;
+using DevActivator.Common.BL.Extensions;
 using DevActivator.Meetups.BL.Entities;
-using DevActivator.Meetups.BL.Enums;
 using DevActivator.Meetups.BL.Models;
 
 namespace DevActivator.Meetups.BL.Extensions
@@ -47,8 +47,5 @@ public static Venue Extend(this Venue original, VenueVm venue)
                 Address = venue.Address,
                 MapUrl = venue.MapUrl
             };
-
-        private static City GetCity(this string id)
-            => (City) Enum.Parse(typeof(City), id.Substring(0, 3), true);
     }
 }

DevActivator.Meetups.BL/Helpers/ShellHelper.cs

@@ -29,7 +29,7 @@ public static string Bash(this string command)
                 result = process.StandardOutput.ReadToEnd();
                 process.WaitForExit();
             }
-            catch (Exception _)
+            catch (Exception)
             {
                 result = "bash error";
             }

DevActivator.Meetups.BL/Models/MeetupVm.cs

@@ -16,6 +16,6 @@ public class MeetupVm
 
         public string VenueId { get; set; }
 
-        public List<Session> Sessions { get; set; }
+        public List<SessionVm> Sessions { get; set; }
     }
 }

DevActivator.Meetups.BL/Models/SessionVm.cs

@@ -0,0 +1,11 @@
+namespace DevActivator.Meetups.BL.Models
+{
+    public class SessionVm
+    {
+        public string TalkId { get; set; }
+
+        public string StartTime { get; set; }
+
+        public string EndTime { get; set; }
+    }
+}

DevActivator.Meetups.BL/Models/VenueVm.cs

@@ -1,4 +1,4 @@
-using DevActivator.Meetups.BL.Enums;
+using DevActivator.Common.BL.Enums;
 
 namespace DevActivator.Meetups.BL.Models
 {

DevActivator.Meetups.BL/Services/MeetupService.cs

@@ -32,7 +32,7 @@ public async Task<List<AutocompleteRow>> GetAllMeetupsAsync()
         public async Task<MeetupVm> GetMeetupAsync(string meetupId)
         {
             var meetup = await _meetupProvider.GetMeetupOrDefaultAsync(meetupId).ConfigureAwait(false);
-            return meetup.ToVm();
+            return meetup?.ToVm();
         }
 
         public async Task<MeetupVm> AddMeetupAsync(MeetupVm meetup)

DevActivator.Meetups.Tests/ProviderTests/MeetupProviderTests.cs

@@ -9,16 +9,6 @@ namespace DevActivator.Meetups.Tests.ProviderTests
 {
     public class MeetupProviderTests
     {
-        [Fact]
-        public async Task MeetupDateDeserializationSucceed()
-        {
-            // prepare
-            var meetup = await GetTestMeetupAsync();
-
-            // test
-            Assert.NotEmpty(meetup.Date);
-        }
-
         [Fact]
         public async Task MeetupFriendIdsDeserializationSucceed()
         {
@@ -39,16 +29,6 @@ public async Task MeetupSessionsDeserializationSucceed()
             Assert.Equal(2, talk.Sessions.Count);
         }
 
-        [Fact]
-        public async Task MeetupTalkIdsDeserializationSucceed()
-        {
-            // prepare
-            var talk = await GetTestMeetupAsync();
-
-            // test
-            Assert.Equal(2, talk.TalkIds.Count);
-        }
-
         private Task<Meetup> GetTestMeetupAsync(string testMeetupId = "SpbDotNet-30")
         {
             var settings = new Settings {AuditRepoDirectory = "/Users/alex-mbp/repos/Audit"};

DevActivator/ClientApp/app/app.component.css

@@ -2,4 +2,9 @@
 .mat-drawer-container {
     height: 100%;
     display: block;
+}
+
+.router-container {
+    /* 64px - toolbar */
+    height: calc(100% - 64px);
 }

DevActivator/ClientApp/app/app.component.html

@@ -6,6 +6,8 @@
 
     <mtp-toolbar [drawer]="drawer"></mtp-toolbar>
 
-    <router-outlet></router-outlet>
+    <div class="router-container">
+        <router-outlet></router-outlet>
+    </div>
 
 </mat-drawer-container>

DevActivator/ClientApp/app/app.shared.module.ts

@@ -9,6 +9,7 @@ import { MeetupEditorModule } from "@dotnetru/pages/meetup-editor";
 import { SearchPageModule } from "@dotnetru/pages/search";
 import { SpeakerEditorModule } from "@dotnetru/pages/speaker-editor";
 import { TalkEditorModule } from "@dotnetru/pages/talk-editor";
+import { TimepadModule } from "@dotnetru/pages/timepad";
 import { VenueEditorModule } from "@dotnetru/pages/venue-editor";
 import { AutocompleteModule } from "@dotnetru/shared/autocomplete";
 import { SpeakerListModule } from "@dotnetru/speaker-list";
@@ -42,6 +43,8 @@ import { SearchPageComponent } from "./pages/search/search.component";
         TalkEditorModule,
         VenueEditorModule,
 
+        TimepadModule,
+
         SearchPageModule,
 
         RouterModule.forRoot([

DevActivator/ClientApp/app/components/friend-list/friend-list.component.html

@@ -3,5 +3,6 @@
                   [data]="friends"
                   [iconName]="iconName"
                   [iconText]="iconText"
+                  [clearOnSelect]="clearOnSelect"
                   (selected)="onSelected($event)"
                   (iconClicked)="onIconClicked()"></mtp-autocomplete>

DevActivator/ClientApp/app/components/friend-list/friend-list.component.ts

@@ -24,6 +24,7 @@ export class FriendListComponent implements OnInit, OnDestroy {
     @Input() public title: string = "Поиск друга";
     @Input() public iconName: string = "add";
     @Input() public iconText: string = "Добавить";
+    @Input() public clearOnSelect: boolean = false;
 
     @Input() public set friendLink(value: { friendId?: string }) {
         if (value && value.friendId) {
@@ -33,7 +34,7 @@ export class FriendListComponent implements OnInit, OnDestroy {
 
     @ViewChild("autocomplete") public autocomplete!: AutocompleteComponent;
 
-    @Output() public readonly selected: EventEmitter<IAutocompleteRow> = new EventEmitter<IAutocompleteRow>();
+    @Output() public readonly selected: EventEmitter<string> = new EventEmitter<string>();
     @Output() public readonly iconClicked: EventEmitter<void> = new EventEmitter<void>();
 
     public friends: IAutocompleteRow[] = [];
@@ -75,7 +76,7 @@ export class FriendListComponent implements OnInit, OnDestroy {
     }
 
     public onSelected(row: IAutocompleteRow): void {
-        this.selected.emit(row);
+        this.selected.emit(row.id);
     }
 
     public onIconClicked(): void {

DevActivator/ClientApp/app/components/navmenu/index.ts

@@ -0,0 +1 @@
+export { NavMenuModule } from "./navmenu.module";

DevActivator/ClientApp/app/components/navmenu/navmenu.component.css

@@ -0,0 +1,4 @@
+:host {
+    display: flex;
+    flex-direction: column;
+}

DevActivator/ClientApp/app/components/navmenu/navmenu.component.html

@@ -1,12 +1,46 @@
-<ul>
-    <li [routerLinkActive]="['link-active']">
-        <a [routerLink]="['/home']">
-            Home
-        </a>
-    </li>
-    <li [routerLinkActive]="['link-active']">
-        <a [routerLink]="['/speaker-list']">
-            Speaker list
-        </a>
-    </li>
-</ul>
+<button mat-button
+        [matMenuTriggerFor]="createEntityMenu">
+    <mat-icon>fiber_new</mat-icon>
+    <span>Создать</span>
+</button>
+
+<a mat-button
+   [routerLink]="['/search']">
+    <mat-icon>search</mat-icon>
+    <span>Поиск</span>
+</a>
+
+<a mat-button
+   [routerLink]="['/timepad/SpbDotNet-30']">
+    <mat-icon>developer_mode</mat-icon>
+    <span>В разработке</span>
+</a>
+
+<mat-menu #createEntityMenu="matMenu">
+    <a mat-menu-item
+       [routerLink]="['/timepad']">
+        <img class="mat-icon"
+             src="/icons/meetup.svg">
+        <span>Встречу</span>
+    </a>
+    <a mat-menu-item
+       [routerLink]="['/speaker-creator']">
+        <mat-icon>person</mat-icon>
+        <span>Докладчика</span>
+    </a>
+    <a mat-menu-item
+       [routerLink]="['/talk-creator']">
+        <mat-icon>speaker_notes</mat-icon>
+        <span>Доклад</span>
+    </a>
+    <a mat-menu-item
+       [routerLink]="['/venue-creator']">
+        <mat-icon>account_balance</mat-icon>
+        <span>Площадку</span>
+    </a>
+    <a mat-menu-item
+       [routerLink]="['/friend-creator']">
+        <mat-icon>loyalty</mat-icon>
+        <span>Друга</span>
+    </a>
+</mat-menu>