* yavsc.js:
* yavsc.circles.js: js refactoring * Credits.aspx: A credit about to add * CircleBase.cs: The Circle base * NpgsqlCircleProvider.cs: * refactoring * updates the circle * InputCircle.cs: using the new CircleBase class * ResultPages.cs: Using a new "None" attribute * CircleController.cs: refactoring : drops the NewCircle class The `List` method now resterns collection of circlebase * style.css: * a new `dirty` css class, could be used to tag data to validate ala ajax * removed quite all of the `float` usages * AccountController.cs: xml doc * BlogsController.cs: Avatar method moved to the Account controller * YavscHelpers.cs: An avatar url * App.master: Login div moved up * Circles.aspx: a new `private` filed in the `Circle` object, in order to keep circle names from being published as user's information, should be true by default * Profile.aspx: removed the tables * Index.aspx: Un message plus explicite * Web.config: nothing to view * Web.csproj: * new page : Credit * new script: yavsc.circle.js * instdbws.sql: circles are uniques for a given user against a given app * Circle.cs: Now inherits CircleBase to implement a member list * CircleProvider.cs: implements a circle update method * LocalizedText.resx: * LocalizedText.Designer.cs: no content!!! * LocalizedText.fr.resx: * LocalizedText.fr.Designer.cs: pas content * YavscModel.csproj: a new CircleBAse class
This commit is contained in:
parent
37188df28a
commit
b7fa996dbc
30 changed files with 730 additions and 460 deletions
|
|
@ -1,3 +1,21 @@
|
|||
2015-09-10 Paul Schneider <paul@pschneider.fr>
|
||||
|
||||
* CircleBase.cs: The Circle base
|
||||
|
||||
* Circle.cs: Now inherits CircleBase to implement a member
|
||||
list
|
||||
|
||||
* CircleProvider.cs: implements a circle update method
|
||||
|
||||
|
||||
* LocalizedText.resx:
|
||||
* LocalizedText.Designer.cs: no content!!!
|
||||
|
||||
* LocalizedText.fr.resx:
|
||||
* LocalizedText.fr.Designer.cs: pas content
|
||||
|
||||
* YavscModel.csproj: a new CircleBAse class
|
||||
|
||||
2015-08-22 Paul Schneider <paul@pschneider.fr>
|
||||
|
||||
* LocalizedText.Designer.cs: alphabetic order in ressource
|
||||
|
|
|
|||
|
|
@ -26,24 +26,9 @@ namespace Yavsc.Model.Circles
|
|||
/// <summary>
|
||||
/// Circle.
|
||||
/// </summary>
|
||||
public class Circle
|
||||
public class Circle : CircleBase
|
||||
{
|
||||
/// <summary>
|
||||
/// Gets or sets the identifier.
|
||||
/// </summary>
|
||||
/// <value>The identifier.</value>
|
||||
public long Id { get; set; }
|
||||
/// <summary>
|
||||
/// Gets or sets the title.
|
||||
/// </summary>
|
||||
/// <value>The title.</value>
|
||||
public string Title { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the owner.
|
||||
/// </summary>
|
||||
/// <value>The owner.</value>
|
||||
public string Owner { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the users.
|
||||
|
|
@ -67,11 +52,6 @@ namespace Yavsc.Model.Circles
|
|||
}
|
||||
return content.ToArray ();
|
||||
}
|
||||
/// <summary>
|
||||
/// Gets or sets a value indicating whether this instance is private.
|
||||
/// </summary>
|
||||
/// <value><c>true</c> if this instance is private; otherwise, <c>false</c>.</value>
|
||||
public bool IsPrivate { get; set; }
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
56
yavscModel/Circles/CircleBase.cs
Normal file
56
yavscModel/Circles/CircleBase.cs
Normal file
|
|
@ -0,0 +1,56 @@
|
|||
//
|
||||
// CircleBase.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;
|
||||
|
||||
namespace Yavsc.Model.Circles
|
||||
{
|
||||
public class CircleBase
|
||||
{
|
||||
public CircleBase ()
|
||||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the owner.
|
||||
/// </summary>
|
||||
/// <value>The owner.</value>
|
||||
public string Owner { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the identifier.
|
||||
/// </summary>
|
||||
/// <value>The identifier.</value>
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the title.
|
||||
/// </summary>
|
||||
/// <value>The title.</value>
|
||||
public string Title { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets a value indicating whether this instance is private.
|
||||
/// </summary>
|
||||
/// <value><c>true</c> if this instance is private; otherwise, <c>false</c>.</value>
|
||||
public bool IsPrivate { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -48,7 +48,7 @@ namespace Yavsc.Model.Circles
|
|||
/// </summary>
|
||||
/// <param name="id">circle Identifier.</param>
|
||||
/// <param name="username">User name.</param>
|
||||
public abstract void Add(long id, string username);
|
||||
public abstract void AddMember(long id, string username);
|
||||
|
||||
/// <summary>
|
||||
/// Delete the specified circle by its id.
|
||||
|
|
@ -57,15 +57,21 @@ namespace Yavsc.Model.Circles
|
|||
public abstract void Delete(long id) ;
|
||||
|
||||
/// <summary>
|
||||
/// Get the specified id.
|
||||
/// Get the specified circle by id, including all of its members.
|
||||
/// </summary>
|
||||
/// <param name="id">Identifier.</param>
|
||||
public abstract Circle Get(long id);
|
||||
public abstract Circle GetMembers(long id);
|
||||
/// <summary>
|
||||
/// Get the specified circle by id.
|
||||
/// </summary>
|
||||
/// <param name="id">Identifier.</param>
|
||||
public abstract CircleBase Get (long id);
|
||||
|
||||
public abstract long GetId (string circle, string username);
|
||||
/// <summary>
|
||||
/// List circle's user.
|
||||
/// </summary>
|
||||
public abstract IEnumerable<Circle> List(string user);
|
||||
public abstract IEnumerable<CircleBase> List(string user);
|
||||
|
||||
/// <summary>
|
||||
/// True when the specified user is listed in one of
|
||||
|
|
@ -88,6 +94,12 @@ namespace Yavsc.Model.Circles
|
|||
/// <param name="member">Member.</param>
|
||||
public abstract void RemoveMember(string member);
|
||||
|
||||
/// <summary>
|
||||
/// Updates the circle.
|
||||
/// </summary>
|
||||
/// <param name="c">C.</param>
|
||||
public abstract void UpdateCircle(CircleBase c);
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
36
yavscModel/LocalizedText.Designer.cs
generated
36
yavscModel/LocalizedText.Designer.cs
generated
|
|
@ -112,6 +112,12 @@ namespace Yavsc.Model {
|
|||
}
|
||||
}
|
||||
|
||||
public static string no_content {
|
||||
get {
|
||||
return ResourceManager.GetString("no_content", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static string DuplicateEmail {
|
||||
get {
|
||||
return ResourceManager.GetString("DuplicateEmail", resourceCulture);
|
||||
|
|
@ -124,9 +130,9 @@ namespace Yavsc.Model {
|
|||
}
|
||||
}
|
||||
|
||||
public static string Pdf_version {
|
||||
public static string Modify {
|
||||
get {
|
||||
return ResourceManager.GetString("Pdf_version", resourceCulture);
|
||||
return ResourceManager.GetString("Modify", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -232,9 +238,9 @@ namespace Yavsc.Model {
|
|||
}
|
||||
}
|
||||
|
||||
public static string Remember_me {
|
||||
public static string Private_circle {
|
||||
get {
|
||||
return ResourceManager.GetString("Remember_me", resourceCulture);
|
||||
return ResourceManager.GetString("Private_circle", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -262,15 +268,21 @@ namespace Yavsc.Model {
|
|||
}
|
||||
}
|
||||
|
||||
public static string Remember_me {
|
||||
get {
|
||||
return ResourceManager.GetString("Remember_me", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static string Remove {
|
||||
get {
|
||||
return ResourceManager.GetString("Remove", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static string was_added_to_the_role {
|
||||
public static string none {
|
||||
get {
|
||||
return ResourceManager.GetString("was_added_to_the_role", resourceCulture);
|
||||
return ResourceManager.GetString("none", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -334,6 +346,12 @@ namespace Yavsc.Model {
|
|||
}
|
||||
}
|
||||
|
||||
public static string Pdf_version {
|
||||
get {
|
||||
return ResourceManager.GetString("Pdf_version", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static string Item_added_to_basket {
|
||||
get {
|
||||
return ResourceManager.GetString("Item_added_to_basket", resourceCulture);
|
||||
|
|
@ -357,5 +375,11 @@ namespace Yavsc.Model {
|
|||
return ResourceManager.GetString("entries", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static string was_added_to_the_role {
|
||||
get {
|
||||
return ResourceManager.GetString("was_added_to_the_role", resourceCulture);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
26
yavscModel/LocalizedText.fr.Designer.cs
generated
26
yavscModel/LocalizedText.fr.Designer.cs
generated
|
|
@ -46,6 +46,12 @@ namespace Yavsc.Model {
|
|||
}
|
||||
}
|
||||
|
||||
public static string was_added_to_the_empty_role {
|
||||
get {
|
||||
return ResourceManager.GetString("was_added_to_the_empty_role", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static string Bill_edition {
|
||||
get {
|
||||
return ResourceManager.GetString("Bill_edition", resourceCulture);
|
||||
|
|
@ -88,9 +94,9 @@ namespace Yavsc.Model {
|
|||
}
|
||||
}
|
||||
|
||||
public static string was_added_to_the_empty_role {
|
||||
public static string Title {
|
||||
get {
|
||||
return ResourceManager.GetString("was_added_to_the_empty_role", resourceCulture);
|
||||
return ResourceManager.GetString("Title", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -112,6 +118,12 @@ namespace Yavsc.Model {
|
|||
}
|
||||
}
|
||||
|
||||
public static string no_content {
|
||||
get {
|
||||
return ResourceManager.GetString("no_content", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static string DocTemplateException {
|
||||
get {
|
||||
return ResourceManager.GetString("DocTemplateException", resourceCulture);
|
||||
|
|
@ -124,9 +136,9 @@ namespace Yavsc.Model {
|
|||
}
|
||||
}
|
||||
|
||||
public static string Title {
|
||||
public static string Modify {
|
||||
get {
|
||||
return ResourceManager.GetString("Title", resourceCulture);
|
||||
return ResourceManager.GetString("Modify", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -262,6 +274,12 @@ namespace Yavsc.Model {
|
|||
}
|
||||
}
|
||||
|
||||
public static string none {
|
||||
get {
|
||||
return ResourceManager.GetString("none", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
public static string Estimate_not_found {
|
||||
get {
|
||||
return ResourceManager.GetString("Estimate_not_found", resourceCulture);
|
||||
|
|
|
|||
|
|
@ -14,6 +14,9 @@
|
|||
</resheader>
|
||||
<data name="Count"><value>Nombre</value></data>
|
||||
<data name="Ciffer"><value>Chiffre</value></data>
|
||||
<data name="none"><value>aucun(e)</value></data>
|
||||
<data name="Modify"><value>Modifier</value></data>
|
||||
<data name="no_content"><value>pas de contenu</value></data>
|
||||
<data name="Title"><value>Titre</value></data>
|
||||
<data name="Description"><value>Description</value></data>
|
||||
<data name="Product_reference"><value>Référence produit</value></data>
|
||||
|
|
|
|||
|
|
@ -42,12 +42,17 @@
|
|||
<data name="Members"><value>Members</value></data>
|
||||
<data name="Message_sent"><value>Your message has been sent.</value></data>
|
||||
<data name="MinDate"><value>Minimal date for the rendez-vous</value></data>
|
||||
<data name="Modify"><value>Modify</value></data>
|
||||
<data name="My_Estimates"><value>My estimates</value></data>
|
||||
<data name="none"><value>none</value></data>
|
||||
<data name="no_content"><value>no content</value></data>
|
||||
<data name="Not_Approuved"><value>Not Approuved</value></data>
|
||||
<data name="Online"><value>Online</value></data>
|
||||
<data name="Offline"><value>Offline</value></data>
|
||||
<data name="Pdf_version"><value>Pdf version</value></data>
|
||||
<data name="Preview"><value>Preview</value><comment>comment on preview</comment></data>
|
||||
<data name="Private_circle"><value>Private circle</value></data>
|
||||
|
||||
<data name="ProviderId"><value>Provider identifier</value></data>
|
||||
<data name="ProviderName"><value>Provider name</value></data>
|
||||
<data name="Product_reference"><value>Product_reference</value></data>
|
||||
|
|
@ -65,4 +70,5 @@
|
|||
<data name="was_added_to_the_empty_role"><value>There was no user in the '{1}' role. You ({0}) was just added as firt user in the '{1}' role.</value></data>
|
||||
<data name="Welcome"><value>Welcome</value><comment></comment></data>
|
||||
<data name="younotadmin"><value>You're not administrator</value></data>
|
||||
|
||||
</root>
|
||||
|
|
|
|||
|
|
@ -166,6 +166,7 @@
|
|||
<Compile Include="Blogs\PostNotFoundException.cs" />
|
||||
<Compile Include="RolesAndMembers\ChangeUserNameProvider.cs" />
|
||||
<Compile Include="RolesAndMembers\UserManager.cs" />
|
||||
<Compile Include="Circles\CircleBase.cs" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
<ItemGroup>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue