many changes

This commit is contained in:
Paul Schneider 2015-01-02 04:52:48 +01:00
commit 6809e3dfe2
49 changed files with 3429 additions and 215 deletions

View file

@ -0,0 +1,48 @@
//
// AskForADate.cs
//
// Author:
// Paul Schneider <paulschneider@free.fr>
//
// Copyright (c) 2014 Paul Schneider
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
namespace Yavsc.Model.Google
{
public class AskForADate
{
public AskForADate ()
{
MinDate = MaxDate = DateTime.Now.AddMinutes (5);
}
[Display(Name="MinDate",ResourceType=typeof(LocalizedText))]
[DataType(DataType.Date)]
[DisplayFormat(DataFormatString = "{0:dd/MM/yyyy}", ApplyFormatInEditMode = true)]
public DateTime MinDate { get; set; }
[Display(Name="MaxDate",ResourceType=typeof(LocalizedText))]
[DataType(DataType.Date)]
[DisplayFormat(DataFormatString = "{0:dd/MM/yyyy}", ApplyFormatInEditMode = true)]
public DateTime MaxDate { get; set; }
[Display(Name="Consultant",ResourceType=typeof(LocalizedText))]
public string UserName { get; set; }
}
}

View file

@ -34,24 +34,6 @@ using Yavsc.Model;
namespace Yavsc.Model.Google
{
/*
"url": "https://plus.google.com/111395572362177872801",
"image": {
"url": "https://lh6.googleusercontent.com/-JqDVMPqafdA/AAAAAAAAAAI/AAAAAAAAADY/FamseW6_nl4/photo.jpg?sz=50",
"isDefault": false
},
"placesLived": [
{
"value": "Suresnes, France",
"primary": true
}
],
"isPlusUser": true,
"language": "fr",
"circledByCount": 0,
"verified": false
}
*/
public class AuthToken {
public string access_token { get; set; }

View file

@ -0,0 +1,45 @@
//
// CalendarList.cs
//
// Author:
// Paul Schneider <paulschneider@free.fr>
//
// Copyright (c) 2014 Paul Schneider
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Threading;
using System.Web.Mvc;
using System.Configuration;
using System.Threading.Tasks;
using System.Text;
using System.Net;
using System.IO;
using Yavsc.Model;
namespace Yavsc.Model.Google
{
public class CalendarList {
public string kind { get; set;}
public string etag { get; set; }
public string nextSyncToken { get; set; }
public CalendarListEntry[] items { get; set; }
}
}

View file

@ -0,0 +1,65 @@
//
// CalendarListEntry.cs
//
// Author:
// Paul Schneider <paulschneider@free.fr>
//
// Copyright (c) 2014 Paul Schneider
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU Lesser General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public License
// along with this program. If not, see <http://www.gnu.org/licenses/>.
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Threading;
using System.Web.Mvc;
using System.Configuration;
using System.Threading.Tasks;
using System.Text;
using System.Net;
using System.IO;
using Yavsc.Model;
namespace Yavsc.Model.Google
{
public class CalendarListEntry {
public string kind { get; set;}
public string etag { get; set; }
public string id { get; set; }
public string summary { get; set; }
public string description { get; set; }
public string timeZone { get; set; }
public string colorId { get; set; }
public string backgroundColor { get; set; }
public string foregroundColor { get; set; }
public bool selected { get; set; }
public bool primary { get; set; }
public string accessRole { get; set; }
public class Reminder {
public string method { get; set; }
public int minutes { get; set; }
}
public Reminder[] defaultReminders { get; set; }
/* "notificationSettings": { "notifications":
[ { "type": "eventCreation", "method": "email" },
{ "type": "eventChange", "method": "email" },
{ "type": "eventCancellation", "method": "email" },
{ "type": "eventResponse", "method": "email" } ] }, "primary": true },
*/
}
}

View file

@ -34,6 +34,7 @@ using Yavsc.Model;
namespace Yavsc.Model.Google
{
public class People {
public string kind { get; set; }
public string etag { get; set; }

View file

@ -106,6 +106,12 @@ namespace Yavsc.Model {
}
}
public static string Remember_me {
get {
return ResourceManager.GetString("Remember_me", resourceCulture);
}
}
public static string Title {
get {
return ResourceManager.GetString("Title", resourceCulture);
@ -136,6 +142,18 @@ namespace Yavsc.Model {
}
}
public static string Date_search {
get {
return ResourceManager.GetString("Date_search", resourceCulture);
}
}
public static string Google_calendar {
get {
return ResourceManager.GetString("Google_calendar", resourceCulture);
}
}
public static string Description {
get {
return ResourceManager.GetString("Description", resourceCulture);
@ -154,16 +172,34 @@ namespace Yavsc.Model {
}
}
public static string MinDate {
get {
return ResourceManager.GetString("MinDate", resourceCulture);
}
}
public static string Tex_version {
get {
return ResourceManager.GetString("Tex_version", resourceCulture);
}
}
public static string Consultant {
get {
return ResourceManager.GetString("Consultant", resourceCulture);
}
}
public static string Count {
get {
return ResourceManager.GetString("Count", resourceCulture);
}
}
public static string MaxDate {
get {
return ResourceManager.GetString("MaxDate", resourceCulture);
}
}
}
}

View file

@ -33,4 +33,10 @@
<data name="Google_error"><value>Erreur Google : {0}</value></data>
<data name="access_denied"><value>Accès refusé</value></data>
<data name="UserName"><value>Nom d'utilisateur</value></data>
<data name="Google_calendar"><value>Agenda Google</value></data>
<data name="Consultant"><value>Consultant</value></data>
<data name="MinDate"><value>Date minimale du rendez-vous</value></data>
<data name="MaxDate"><value>Date maximale du rendez-vous</value></data>
<data name="Date_search"><value>Recherche d'une date pour rendez-vous</value></data>
<data name="Remember_me"><value>Se souvenir du mot de passe</value></data>
</root>

View file

@ -33,4 +33,10 @@
<data name="Google_error"><value>Google error : {0}</value></data>
<data name="access_denied"><value>Access denied</value></data>
<data name="UserName"><value>User name</value></data>
</root>
<data name="Google_calendar"><value>Google calendar</value></data>
<data name="Consultant"><value>Consultant</value></data>
<data name="MinDate"><value>Minimal date for the rendez-vous</value></data>
<data name="MaxDate"><value>Maximal date for the rendez-vous</value></data>
<data name="Date_search"><value>Date search for a rendez-vous</value></data>
<data name="Remember_me"><value>Remember me</value></data>
</root>

View file

@ -16,7 +16,7 @@ namespace Yavsc.Model.RolesAndMembers
[RegularExpression("([a-z]|[A-Z]|[-_.~#{}`'\\^])+")]
public string Password { get; set; }
[Display(Name = "Se souvenir du mot de passe")]
[Display(Name = "Remember_me",ResourceType=typeof(LocalizedText))]
public bool RememberMe { get; set; }
}
}

View file

@ -3,6 +3,7 @@ using System.ComponentModel;
using System.ComponentModel.DataAnnotations;
using System.Web.Profile;
using System.Web.Security;
using System.Web;
namespace Yavsc.Model.RolesAndMembers
{
@ -78,7 +79,7 @@ namespace Yavsc.Model.RolesAndMembers
[DisplayName ("Clé RIB")]
public int BankedKey { get; set; }
[Display(Name="Google Calendar")]
[Display(Name="Google_calendar",ResourceType=typeof(LocalizedText))]
public string GoogleCalendar { get; set; }
public bool IsBankable { get {
@ -107,6 +108,8 @@ namespace Yavsc.Model.RolesAndMembers
{
}
public bool RememberMe { get; set; }
public Profile (ProfileBase profile)
{
object b = profile.GetPropertyValue ("BlogVisible");
@ -163,6 +166,8 @@ namespace Yavsc.Model.RolesAndMembers
s = profile.GetPropertyValue ("BankedKey");
BankedKey = (s == null) ? 0 : (s is DBNull)? 0 : (int)s;
s = profile.GetPropertyValue ("gcalid");
GoogleCalendar = (s is DBNull)? null : (string) s;
}
}
}

View file

@ -88,6 +88,9 @@
<Compile Include="Google\People.cs" />
<Compile Include="Google\AuthToken.cs" />
<Compile Include="Google\SignIn.cs" />
<Compile Include="Google\CalendarList.cs" />
<Compile Include="Google\CalendarListEntry.cs" />
<Compile Include="Google\AskForADate.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>