* Circle.cs:
* CircleInfo.cs: * CircleInfoCollection.cs: cleans imports * CircleManager.cs: implements a circle manager * CircleProvider.cs: Defines a default Circle provider * EventPub.cs: * CalendarController.cs: refactoring * CircleController.cs: implements with default circle provider * FrontOfficeController.cs: throws descriptive exception message at searching for a catalog * Catalog.aspx: Fixes links on product categories * ProductCategory.aspx: Fixes links on products * YavscModel.csproj: Includes Circle provider definitions
This commit is contained in:
@ -26,6 +26,7 @@ using System.Web.Security;
|
||||
using Yavsc.Model.Google;
|
||||
using Yavsc.Helpers;
|
||||
using System.Web.Profile;
|
||||
using Yavsc.Model.Circles;
|
||||
|
||||
|
||||
namespace Yavsc.ApiControllers
|
||||
|
@ -20,6 +20,10 @@
|
||||
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
using System;
|
||||
using System.Web.Http;
|
||||
using Yavsc.Model.RolesAndMembers;
|
||||
using System.Collections.Generic;
|
||||
using Yavsc.Model.Circles;
|
||||
using System.Web.Security;
|
||||
|
||||
namespace Yavsc.ApiControllers
|
||||
{
|
||||
@ -32,26 +36,44 @@ namespace Yavsc.ApiControllers
|
||||
/// Add the specified id and users.
|
||||
/// </summary>
|
||||
/// <param name="id">Identifier.</param>
|
||||
/// <param name="title">Title.</param>
|
||||
/// <param name="users">Users.</param>
|
||||
[Authorize]
|
||||
public void Add(string id, string [] users)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
string user = Membership.GetUser ().UserName;
|
||||
CircleManager.DefaultProvider.Add (user, id, users);
|
||||
}
|
||||
/// <summary>
|
||||
/// Delete the specified id.
|
||||
/// </summary>
|
||||
/// <param name="id">Identifier.</param>
|
||||
public void Delete(string id)
|
||||
[Authorize] public void Delete(string id)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
string user = Membership.GetUser ().UserName;
|
||||
CircleManager.DefaultProvider.Delete (user, id);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get the specified id.
|
||||
/// </summary>
|
||||
/// <param name="id">Identifier.</param>
|
||||
public string[] Get(string id)
|
||||
[Authorize]
|
||||
public Circle Get(string id)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
string user = Membership.GetUser ().UserName;
|
||||
return CircleManager.DefaultProvider.Get (user, id);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// List this instance.
|
||||
/// </summary>
|
||||
[Authorize]
|
||||
public CircleInfoCollection List()
|
||||
{
|
||||
string user = Membership.GetUser ().UserName;
|
||||
return CircleManager.DefaultProvider.List ();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,3 +1,16 @@
|
||||
2015-06-10 Paul Schneider <paul@pschneider.fr>
|
||||
|
||||
* CalendarController.cs: refactoring
|
||||
|
||||
* CircleController.cs: implements with default circle provider
|
||||
|
||||
* FrontOfficeController.cs: throws descriptive exception
|
||||
message at searching for a catalog
|
||||
|
||||
* Catalog.aspx: Fixes links on product categories
|
||||
|
||||
* ProductCategory.aspx: Fixes links on products
|
||||
|
||||
2015-06-09 Paul Schneider <paul@pschneider.fr>
|
||||
|
||||
* Edit.aspx: A Page Title
|
||||
|
@ -153,9 +153,17 @@ namespace Yavsc.Controllers
|
||||
{
|
||||
ViewData ["BrandId"] = brandid;
|
||||
ViewData ["ProductCategoryId"] = pcid;
|
||||
return View (
|
||||
CatalogManager.GetCatalog ().GetBrand (brandid).GetProductCategory (pcid)
|
||||
);
|
||||
|
||||
var cat = CatalogManager.GetCatalog ();
|
||||
if (cat == null)
|
||||
throw new Exception ("No catalog");
|
||||
var brand = cat.GetBrand (brandid);
|
||||
if (brand == null)
|
||||
throw new Exception ("Not a brand id: "+brandid);
|
||||
var pcat = brand.GetProductCategory (pcid);
|
||||
if (pcat == null)
|
||||
throw new Exception ("Not a product category id in this brand: " + pcid);
|
||||
return View (pcat);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@ -6,7 +6,7 @@
|
||||
<p><i><%= Html.Encode( b.Slogan ) %></i></p>
|
||||
<% foreach (ProductCategory pc in b.Categories ) { %>
|
||||
<div>
|
||||
<h2><%= Html.ActionLink( pc.Name, "ProductCategory", new { id = b.Name, pc = pc.Reference }, new { @class="actionlink" } ) %></h2>
|
||||
<h2><%= Html.ActionLink( pc.Name, "ProductCategory", new { brandid= b.Name, pcid = pc.Reference }, new { @class="actionlink" } ) %></h2>
|
||||
</div>
|
||||
|
||||
<% foreach (Product p in pc.Products ) { %>
|
||||
|
@ -3,7 +3,7 @@
|
||||
<asp:Content ContentPlaceHolderID="MainContent" ID="MainContentContent" runat="server">
|
||||
<% foreach (Product p in Model.Products ) { %>
|
||||
|
||||
<h3><%= Html.ActionLink( p.Name, "Product", new { id = ViewData["BrandName"], pc = Model.Reference , pref = p.Reference }, new { @class="actionlink" } ) %></h3>
|
||||
<h3><%= Html.ActionLink( p.Name, "Product", new { id = ViewData["BrandId"], pc = Model.Reference , pref = p.Reference }, new { @class="actionlink" } ) %></h3>
|
||||
|
||||
<p>
|
||||
<%= p.Description %>
|
||||
|
@ -24,6 +24,7 @@ using System.ComponentModel.DataAnnotations;
|
||||
using Yavsc.ApiControllers.Calendar.Model;
|
||||
using Yavsc.Model;
|
||||
using Yavsc.Model.RolesAndMembers;
|
||||
using Yavsc.Model.Circles;
|
||||
|
||||
namespace Yavsc.ApiControllers.Calendar.Model
|
||||
{
|
||||
|
@ -1,3 +1,17 @@
|
||||
2015-06-10 Paul Schneider <paul@pschneider.fr>
|
||||
|
||||
* Circle.cs:
|
||||
* CircleInfo.cs:
|
||||
* CircleInfoCollection.cs: cleans imports
|
||||
|
||||
* CircleManager.cs: implements a circle manager
|
||||
|
||||
* CircleProvider.cs: Defines a default Circle provider
|
||||
|
||||
* EventPub.cs: refactoring
|
||||
|
||||
* YavscModel.csproj: Includes Circle provider definitions
|
||||
|
||||
2015-06-09 Paul Schneider <paul@pschneider.fr>
|
||||
|
||||
* LocalizedText.resx:
|
||||
|
@ -19,17 +19,21 @@
|
||||
// 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.Web.Http;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
using System.Collections.Generic;
|
||||
|
||||
namespace Yavsc.Model.RolesAndMembers
|
||||
namespace Yavsc.Model.Circles
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// Circle.
|
||||
/// </summary>
|
||||
public class Circle
|
||||
{
|
||||
/// <summary>
|
||||
/// Gets or sets the identifier.
|
||||
/// </summary>
|
||||
/// <value>The identifier.</value>
|
||||
public long Id { get; set; }
|
||||
/// <summary>
|
||||
/// Gets or sets the title.
|
||||
/// </summary>
|
||||
@ -45,7 +49,7 @@ namespace Yavsc.Model.RolesAndMembers
|
||||
/// <summary>
|
||||
/// Union the specified that.
|
||||
/// </summary>
|
||||
/// <param name="that">That.</param>
|
||||
/// <param name="those">Those circle about to be merged.</param>
|
||||
public static string [] Union (Circle []those)
|
||||
{
|
||||
List<string> content = new List<string>();
|
42
yavscModel/Circles/CircleInfo.cs
Normal file
42
yavscModel/Circles/CircleInfo.cs
Normal file
@ -0,0 +1,42 @@
|
||||
//
|
||||
// CircleInfo.cs
|
||||
//
|
||||
// Author:
|
||||
// Paul Schneider <paul@pschneider.fr>
|
||||
//
|
||||
// Copyright (c) 2015 GNU GPL
|
||||
//
|
||||
// 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.DataAnnotations;
|
||||
|
||||
namespace Yavsc.Model.Circles
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// Circle info.
|
||||
/// </summary>
|
||||
public class CircleInfo
|
||||
{
|
||||
long Id { get; set; }
|
||||
string Title { get; set; }
|
||||
CircleInfo(Circle c)
|
||||
{
|
||||
Id = c.Id;
|
||||
Title = c.Title;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
35
yavscModel/Circles/CircleInfoCollection.cs
Normal file
35
yavscModel/Circles/CircleInfoCollection.cs
Normal file
@ -0,0 +1,35 @@
|
||||
//
|
||||
// CircleInfoCollection.cs
|
||||
//
|
||||
// Author:
|
||||
// Paul Schneider <paul@pschneider.fr>
|
||||
//
|
||||
// Copyright (c) 2015 GNU GPL
|
||||
//
|
||||
// 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;
|
||||
|
||||
namespace Yavsc.Model.Circles
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// Circle info collection.
|
||||
/// </summary>
|
||||
public class CircleInfoCollection : List<CircleInfo>
|
||||
{
|
||||
}
|
||||
|
||||
}
|
115
yavscModel/Circles/CircleManager.cs
Normal file
115
yavscModel/Circles/CircleManager.cs
Normal file
@ -0,0 +1,115 @@
|
||||
//
|
||||
// CircleManager.cs
|
||||
//
|
||||
// Author:
|
||||
// Paul Schneider <paul@pschneider.fr>
|
||||
//
|
||||
// Copyright (c) 2015 GNU GPL
|
||||
//
|
||||
// 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.Security.Permissions;
|
||||
using System.Configuration;
|
||||
using System.Collections.Specialized;
|
||||
using System.Collections;
|
||||
using System.Reflection;
|
||||
|
||||
namespace Yavsc.Model.Circles
|
||||
{
|
||||
/// <summary>
|
||||
/// Circle manager.
|
||||
/// </summary>
|
||||
public class CircleManager
|
||||
{
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="Yavsc.Model.Circles.CircleManager"/> class.
|
||||
/// </summary>
|
||||
public CircleManager ()
|
||||
{
|
||||
}
|
||||
private static CircleProvider defaultProvider=null;
|
||||
/// <summary>
|
||||
/// Gets the default provider.
|
||||
/// </summary>
|
||||
/// <value>The default provider.</value>
|
||||
public static CircleProvider DefaultProvider {
|
||||
get {
|
||||
if (defaultProvider == null)
|
||||
GetProviderSettings ();
|
||||
return defaultProvider;
|
||||
}
|
||||
}
|
||||
|
||||
[PermissionSet(SecurityAction.Demand, Name = "FullTrust")]
|
||||
private static void GetProviderSettings()
|
||||
{
|
||||
System.Configuration.Configuration config =
|
||||
ConfigurationManager.OpenExeConfiguration(
|
||||
ConfigurationUserLevel.None);
|
||||
|
||||
ProtectedConfigurationSection pSection =
|
||||
config.GetSection("circleProviders")
|
||||
as ProtectedConfigurationSection;
|
||||
|
||||
|
||||
ProviderSettingsCollection providerSettings =
|
||||
pSection.Providers;
|
||||
if (pSection.DefaultProvider != null) {
|
||||
ConstructorInfo ci = Type.GetType (providerSettings [pSection.DefaultProvider].Type).GetConstructor (Type.EmptyTypes);
|
||||
defaultProvider = ci.Invoke (Type.EmptyTypes) as CircleProvider;
|
||||
}
|
||||
/*
|
||||
|
||||
foreach (ProviderSettings pSettings in
|
||||
providerSettings)
|
||||
|
||||
|
||||
{
|
||||
|
||||
|
||||
Console.WriteLine(
|
||||
"Provider settings name: {0}",
|
||||
pSettings.Name);
|
||||
|
||||
|
||||
Console.WriteLine(
|
||||
"Provider settings type: {0}",
|
||||
pSettings.Type);
|
||||
|
||||
NameValueCollection parameters =
|
||||
pSettings.Parameters;
|
||||
|
||||
IEnumerator pEnum =
|
||||
parameters.GetEnumerator();
|
||||
|
||||
int i = 0;
|
||||
while (pEnum.MoveNext())
|
||||
{
|
||||
string pLength =
|
||||
parameters[i].Length.ToString();
|
||||
Console.WriteLine(
|
||||
"Provider ssettings: {0} has {1} parameters",
|
||||
pSettings.Name, pLength);
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
*/
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
75
yavscModel/Circles/CircleProvider.cs
Normal file
75
yavscModel/Circles/CircleProvider.cs
Normal file
@ -0,0 +1,75 @@
|
||||
//
|
||||
// CircleManager.cs
|
||||
//
|
||||
// Author:
|
||||
// Paul Schneider <paul@pschneider.fr>
|
||||
//
|
||||
// Copyright (c) 2015 GNU GPL
|
||||
//
|
||||
// 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.Security.Permissions;
|
||||
using System.Configuration;
|
||||
using System.Collections.Specialized;
|
||||
using System.Collections;
|
||||
using System.Reflection;
|
||||
using System.Configuration.Provider;
|
||||
|
||||
namespace Yavsc.Model.Circles
|
||||
{
|
||||
/// <summary>
|
||||
/// Circle provider.
|
||||
/// </summary>
|
||||
public class CircleProvider: ProviderBase
|
||||
{
|
||||
/// <summary>
|
||||
/// Add the specified title and users.
|
||||
/// </summary>
|
||||
/// <param name="title">Title.</param>
|
||||
/// <param name="users">Users.</param>
|
||||
public void Add(string owner, string title, string [] users)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
/// <summary>
|
||||
/// Delete the specified id.
|
||||
/// </summary>
|
||||
/// <param name="title">Title.</param>
|
||||
public void Delete(string owner, string title)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get the specified id.
|
||||
/// </summary>
|
||||
/// <param name="title">Title.</param>
|
||||
public Circle Get(string owner, string title)
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// List this instance.
|
||||
/// </summary>
|
||||
public CircleInfoCollection List()
|
||||
{
|
||||
throw new NotImplementedException ();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -36,11 +36,11 @@
|
||||
<Reference Include="System.Web" />
|
||||
<Reference Include="System.Configuration" />
|
||||
<Reference Include="System.Data" />
|
||||
<Reference Include="System.Web.ApplicationServices" />
|
||||
<Reference Include="System.Web.Mvc" />
|
||||
<Reference Include="System.Net" />
|
||||
<Reference Include="System.Net.Http" />
|
||||
<Reference Include="System.Net.Http.Formatting" />
|
||||
<Reference Include="System.Web.ApplicationServices" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
@ -155,10 +155,14 @@
|
||||
<Compile Include="Calendar\Schedule.cs" />
|
||||
<Compile Include="Calendar\WeekDay.cs" />
|
||||
<Compile Include="Calendar\YaEvent.cs" />
|
||||
<Compile Include="RolesAndMemebers\Circle.cs" />
|
||||
<Compile Include="RolesAndMemebers\Publishing.cs" />
|
||||
<Compile Include="RolesAndMemebers\ProviderPublicInfo.cs" />
|
||||
<Compile Include="Google\GCMRegisterModel.cs" />
|
||||
<Compile Include="Circles\Circle.cs" />
|
||||
<Compile Include="Circles\CircleInfo.cs" />
|
||||
<Compile Include="Circles\CircleInfoCollection.cs" />
|
||||
<Compile Include="Circles\CircleManager.cs" />
|
||||
<Compile Include="Circles\CircleProvider.cs" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
@ -172,6 +176,7 @@
|
||||
<Folder Include="FrontOffice\Catalog\" />
|
||||
<Folder Include="FrontOffice\Catalog\Billing\" />
|
||||
<Folder Include="Google\Messaging\" />
|
||||
<Folder Include="Circles\" />
|
||||
</ItemGroup>
|
||||
<ProjectExtensions>
|
||||
<MonoDevelop>
|
||||
|
Reference in New Issue
Block a user