diff --git a/ChangeLog b/ChangeLog index 1fef97c6..ab07e09d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-11-30 Paul Schneider + + * README.md: mise à jour des priorités + + * Yavsc.sln: ajout du fichier "Features.md" à la solution + 2015-11-30 Paul Schneider * Makefile: Fixe: ne pas déployer sans hôte de destination diff --git a/ITContentProvider/ChangeLog b/ITContentProvider/ChangeLog index cce4f12a..2274b1d1 100644 --- a/ITContentProvider/ChangeLog +++ b/ITContentProvider/ChangeLog @@ -1,3 +1,7 @@ +2015-11-30 Paul Schneider + + * ITContentProvider.csproj: ... + 2015-11-26 Paul Schneider * ITContentProvider.csproj: nouvelles configurations de diff --git a/ITContentProvider/ITContentProvider.csproj b/ITContentProvider/ITContentProvider.csproj index 5c2cb231..576bb965 100644 --- a/ITContentProvider/ITContentProvider.csproj +++ b/ITContentProvider/ITContentProvider.csproj @@ -21,7 +21,6 @@ 4 false bin\Debug\ITContentProvider.xml - v4.5 full @@ -30,13 +29,11 @@ prompt 4 false - v4.5 false bin\Lua 4 - v4.5 false diff --git a/NpgsqlBlogProvider/ChangeLog b/NpgsqlBlogProvider/ChangeLog index e154e49b..7ec47019 100644 --- a/NpgsqlBlogProvider/ChangeLog +++ b/NpgsqlBlogProvider/ChangeLog @@ -1,3 +1,10 @@ +2015-11-30 Paul Schneider + + * NpgsqlBlogProvider.cs: implémente le compteur de billet en + base de données + + * NpgsqlBlogProvider.csproj: ... + 2015-11-28 Paul Schneider * NpgsqlBlogProvider.cs: xml doc diff --git a/NpgsqlBlogProvider/NpgsqlBlogProvider.cs b/NpgsqlBlogProvider/NpgsqlBlogProvider.cs index 91ae6611..9d78e848 100644 --- a/NpgsqlBlogProvider/NpgsqlBlogProvider.cs +++ b/NpgsqlBlogProvider/NpgsqlBlogProvider.cs @@ -15,11 +15,36 @@ namespace Npgsql.Web.Blog /// public class NpgsqlBlogProvider : BlogProvider { - + string applicationName; string connectionString; #region implemented abstract members of BlogProvider + + public override long GetPublicPostCount (string bloggerName) + { + long result = -1; + using (NpgsqlConnection cnx = new NpgsqlConnection (connectionString)) + using (NpgsqlCommand cmd = cnx.CreateCommand ()) { + cmd.CommandText = @" +Select count(*) +FROM blog b +LEFT OUTER JOIN blog_access a ON a.post_id = b._id +WHERE a.post_id IS NULL +AND b.visible = TRUE +AND b.username = :bname +AND b.applicationname = :app + +"; + cmd.Parameters.AddWithValue ("bname", bloggerName); + cmd.Parameters.AddWithValue ("app", applicationName); + cnx.Open (); + result = (long) cmd.ExecuteScalar (); + cnx.Close (); + } + return result; + } + /// /// Updates the post. /// diff --git a/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj b/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj index c3a849cb..1b352a78 100644 --- a/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj +++ b/NpgsqlBlogProvider/NpgsqlBlogProvider.csproj @@ -21,7 +21,6 @@ 4 false bin\Debug\NpgsqlBlogProvider.xml - v4.5 none @@ -30,13 +29,11 @@ prompt 4 false - v4.5 false bin\Lua 4 - v4.5 false diff --git a/NpgsqlContentProvider/ChangeLog b/NpgsqlContentProvider/ChangeLog index 2ca38b25..946d0e7b 100644 --- a/NpgsqlContentProvider/ChangeLog +++ b/NpgsqlContentProvider/ChangeLog @@ -1,3 +1,7 @@ +2015-11-30 Paul Schneider + + * NpgsqlContentProvider.csproj: ... + 2015-11-30 Paul Schneider * NpgsqlContentProvider.cs: Renseigne le code APE et la côte diff --git a/NpgsqlContentProvider/NpgsqlContentProvider.csproj b/NpgsqlContentProvider/NpgsqlContentProvider.csproj index 1d94858a..43f4ad3a 100644 --- a/NpgsqlContentProvider/NpgsqlContentProvider.csproj +++ b/NpgsqlContentProvider/NpgsqlContentProvider.csproj @@ -21,7 +21,6 @@ 4 false bin\Debug\WorkFlowProvider.xml - v4.5 full @@ -30,13 +29,11 @@ prompt 4 false - v4.5 false bin\Lua 4 - v4.5 false diff --git a/NpgsqlMRPProviders/ChangeLog b/NpgsqlMRPProviders/ChangeLog index f592c921..95a06645 100644 --- a/NpgsqlMRPProviders/ChangeLog +++ b/NpgsqlMRPProviders/ChangeLog @@ -1,3 +1,7 @@ +2015-11-30 Paul Schneider + + * NpgsqlMRPProviders.csproj: ... + 2015-11-26 Paul Schneider * NpgsqlMRPProviders.csproj: nouvelles configurations de diff --git a/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj b/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj index 7091ab01..c8b462a8 100644 --- a/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj +++ b/NpgsqlMRPProviders/NpgsqlMRPProviders.csproj @@ -21,7 +21,6 @@ 4 false bin\Debug\NpgsqlMRPProviders.xml - v4.5 none @@ -30,13 +29,11 @@ prompt 4 false - v4.5 false bin\Lua 4 - v4.5 false diff --git a/Presta/ChangeLog b/Presta/ChangeLog index 5318cd3c..a27e4e95 100644 --- a/Presta/ChangeLog +++ b/Presta/ChangeLog @@ -1,3 +1,7 @@ +2015-11-30 Paul Schneider + + * Presta.csproj: ... + 2015-11-26 Paul Schneider * Presta.csproj: nouvelles configurations de déploiement diff --git a/Presta/Presta.csproj b/Presta/Presta.csproj index ede37bae..7fdb4c3e 100644 --- a/Presta/Presta.csproj +++ b/Presta/Presta.csproj @@ -20,7 +20,6 @@ prompt 4 false - v4.5 full @@ -29,13 +28,11 @@ prompt 4 false - v4.5 false bin\Lua 4 - v4.5 false diff --git a/README.md b/README.md index 6076279d..46aec131 100644 --- a/README.md +++ b/README.md @@ -3,14 +3,18 @@ yavsc [doc-fr](http://yavsc.pschneider.fr/Blogs/UserPost/paul/Documentation) -# TODO FIRST +# à faire, par ordre de priorité -1) Implement a Skills provider -2) Create an `UserCardControl` - with quick access for users to his chat and the circle membership, and for admins to his roles, a blogentry count, and a link to the booking system +1) Créer un contrôle "bouton utilisateur" `UserNameControl` + avec + * un acces rapide à l'ajout au cercles perso + * pour les administrateur, une action "bloquer", + * le compteur de ses posts publiques + * Si c'est un préstataire, et si on est pas déjà dans un formulaire de reservation, + un lien vers la reservation de ses services -3) Api refatoring: +2) Refabrication de l'Api : Concerning the blog entry edition, we only need Two methods: @@ -20,4 +24,5 @@ yavsc * `long Post(BlogEntry be)`, used to create or update a given or not blog entry content. the returned value is the entry id at creation, or 0. -4) UI themes + +3) Corriger un peu le thème clair (fond de titres trop sombre) diff --git a/SalesCatalog/ChangeLog b/SalesCatalog/ChangeLog index 2a88d965..ae16abca 100644 --- a/SalesCatalog/ChangeLog +++ b/SalesCatalog/ChangeLog @@ -1,3 +1,7 @@ +2015-11-30 Paul Schneider + + * SalesCatalog.csproj: ... + 2015-11-28 Paul Schneider * XmlCatalogProvider.cs: Le catalogue de vente implémente diff --git a/SalesCatalog/SalesCatalog.csproj b/SalesCatalog/SalesCatalog.csproj index 39b02a2b..66ad8b60 100644 --- a/SalesCatalog/SalesCatalog.csproj +++ b/SalesCatalog/SalesCatalog.csproj @@ -21,7 +21,6 @@ 4 false bin\Debug\SalesCatalog.xml - v4.5 none @@ -30,13 +29,11 @@ prompt 4 false - v4.5 false bin\Lua 4 - v4.5 false diff --git a/TestAPI/ChangeLog b/TestAPI/ChangeLog index 187eeb19..83e898a0 100644 --- a/TestAPI/ChangeLog +++ b/TestAPI/ChangeLog @@ -1,3 +1,7 @@ +2015-11-30 Paul Schneider + + * TestAPI.csproj: ... + 2015-11-26 Paul Schneider * TestAPI.csproj: nouvelles configurations de déploiement diff --git a/TestAPI/TestAPI.csproj b/TestAPI/TestAPI.csproj index 2dcfe548..a1649bc8 100644 --- a/TestAPI/TestAPI.csproj +++ b/TestAPI/TestAPI.csproj @@ -20,7 +20,6 @@ prompt 4 false - v4.5.1 full @@ -29,13 +28,11 @@ prompt 4 false - v4.5.1 false bin\Lua 4 - v4.5.1 false diff --git a/WebControls/ChangeLog b/WebControls/ChangeLog index 4b1d0a14..ef1e3f05 100644 --- a/WebControls/ChangeLog +++ b/WebControls/ChangeLog @@ -1,3 +1,7 @@ +2015-11-30 Paul Schneider + + * WebControls.csproj: ... + 2015-11-30 Paul Schneider * ResultPages.cs: ajoute une classe css au bloc de liens vers diff --git a/WebControls/WebControls.csproj b/WebControls/WebControls.csproj index 121ffcdd..88bd438e 100644 --- a/WebControls/WebControls.csproj +++ b/WebControls/WebControls.csproj @@ -21,7 +21,6 @@ 4 false bin\Debug\Yavsc.WebControls.xml - v4.5 full @@ -30,13 +29,11 @@ prompt 4 false - v4.5 false bin\Lua 4 - v4.5 false diff --git a/Yavsc.sln b/Yavsc.sln index 97ea30c6..7ac9df63 100644 --- a/Yavsc.sln +++ b/Yavsc.sln @@ -28,6 +28,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution LICENSE = LICENSE Makefile = Makefile README.md = README.md + Features.md = Features.md EndProjectSection EndProject Project("{9344BDBB-3E7F-41FC-A0DD-8665D75EE146}") = "pkg", "pkg\pkg.mdproj", "{C6DBD1DC-B619-4DC7-BC92-15693508541E}" diff --git a/plugins/fortune/ChangeLog b/plugins/fortune/ChangeLog index 13d3cb88..d0f83973 100644 --- a/plugins/fortune/ChangeLog +++ b/plugins/fortune/ChangeLog @@ -1,3 +1,7 @@ +2015-11-30 Paul Schneider + + * fortune.csproj: ... + 2015-11-26 Paul Schneider * fortune.csproj: nouvelles configurations de déploiement diff --git a/plugins/fortune/fortune.csproj b/plugins/fortune/fortune.csproj index 3e02836a..d3a965e7 100644 --- a/plugins/fortune/fortune.csproj +++ b/plugins/fortune/fortune.csproj @@ -20,7 +20,6 @@ prompt 4 false - v4.5 full @@ -29,13 +28,11 @@ prompt 4 false - v4.5 false bin\Lua 4 - v4.5 false diff --git a/web/App_Themes/images/p8-av4.jpg b/web/App_Themes/images/p8-av4.jpg new file mode 100644 index 00000000..75a1d010 Binary files /dev/null and b/web/App_Themes/images/p8-av4.jpg differ diff --git a/web/App_Themes/images/p8-av4.l.jpg b/web/App_Themes/images/p8-av4.l.jpg new file mode 100644 index 00000000..1c025321 Binary files /dev/null and b/web/App_Themes/images/p8-av4.l.jpg differ diff --git a/web/App_Themes/images/p8-av4.xs.jpg b/web/App_Themes/images/p8-av4.xs.jpg new file mode 100644 index 00000000..16a363e2 Binary files /dev/null and b/web/App_Themes/images/p8-av4.xs.jpg differ diff --git a/web/ChangeLog b/web/ChangeLog index 396e7c96..3aaae2a0 100644 --- a/web/ChangeLog +++ b/web/ChangeLog @@ -1,3 +1,12 @@ +2015-11-30 Paul Schneider + + * p8-av4.jpg: + * p8-av4.l.jpg: + * p8-av4.xs.jpg: p8-av4 + + * Performer.ascx: Implémente la fiche préstataire, avec son + éventuel lien vers le blog + 2015-11-30 Paul Schneider * SkillController.cs: diff --git a/web/Views/FrontOffice/Performer.ascx b/web/Views/FrontOffice/Performer.ascx new file mode 100644 index 00000000..4636025b --- /dev/null +++ b/web/Views/FrontOffice/Performer.ascx @@ -0,0 +1,28 @@ +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl" %> + + +
+

<%=Html.Encode(Model.UserName)%>

+<%=Html.Partial("RateUserSkillControl", Model) %> +

+E-mail: <<%=Html.Encode(Model.EMail)%>> +<% if (Model.Skills==null) { %> +<%= Html.Translate("") %> + <% } else +foreach (var userskill in Model.Skills) { %> +
  • +<%= userskill.SkillName %> +
    "<%= userskill.Comment %>"
    + <%=Html.Partial("RateUserSkillControl", userskill) %> +
    • +<% } %> +<% if (Model.HasCalendar()) { %> +<%= Html.Translate("Google_calendar") %> : <%= Html.Translate("available") %>.
    +<% } %> +<% if (BlogManager.GetPostCounter(Model.UserName)>0) { %> +"> + + + + +<% } %> \ No newline at end of file diff --git a/yavscModel/Blogs/BlogManager.cs b/yavscModel/Blogs/BlogManager.cs index d767a993..68f55ba9 100644 --- a/yavscModel/Blogs/BlogManager.cs +++ b/yavscModel/Blogs/BlogManager.cs @@ -95,6 +95,11 @@ namespace Yavsc.Model.Blogs { Provider.UpdatePost (postid, title, content, visible, cids); } + + /// + /// Updates the post. + /// + /// Be. public static void UpdatePost (BlogEntry be) { Provider.UpdatePost (be); @@ -203,7 +208,11 @@ namespace Yavsc.Model.Blogs Provider.Tag (postid, tag); } - + /// + /// Rate the specified postid and rate. + /// + /// Postid. + /// Rate. public static void Rate (long postid, int rate) { Provider.Rate (postid, rate); @@ -323,6 +332,15 @@ namespace Yavsc.Model.Blogs var r = bec.Where (x => CanView (x as BlogEntry, u)); return r; } + /// + /// Gets the post counter. + /// + /// The count. + /// Blogger name. + public static long GetPostCounter(string bloggerName) + { + return Provider.GetPublicPostCount (bloggerName); + } } } diff --git a/yavscModel/Blogs/BlogProvider.cs b/yavscModel/Blogs/BlogProvider.cs index f7f4b921..e596b2f9 100644 --- a/yavscModel/Blogs/BlogProvider.cs +++ b/yavscModel/Blogs/BlogProvider.cs @@ -12,6 +12,13 @@ namespace Yavsc.Model.Blogs /// public abstract class BlogProvider: ProviderBase { + /// + /// Gets the public post count. + /// + /// The public post count. + /// Blogger name. + public abstract long GetPublicPostCount (string bloggerName); + /// /// Gets the post. /// diff --git a/yavscModel/ChangeLog b/yavscModel/ChangeLog index 86023c20..14cab23d 100644 --- a/yavscModel/ChangeLog +++ b/yavscModel/ChangeLog @@ -1,3 +1,9 @@ +2015-11-30 Paul Schneider + + * BlogProvider.cs: doc xml + + * BlogManager.cs: implémente un accès au compteur de billet + 2015-11-30 Paul Schneider * PerformerProfile.cs: doc xml diff --git a/yavscclient/ChangeLog b/yavscclient/ChangeLog index d55fa31a..89eb1ae3 100644 --- a/yavscclient/ChangeLog +++ b/yavscclient/ChangeLog @@ -1,3 +1,7 @@ +2015-11-30 Paul Schneider + + * YavscClient.csproj: ... + 2015-11-26 Paul Schneider * YavscClient.csproj: nouvelles configurations de déploiement diff --git a/yavscclient/YavscClient.csproj b/yavscclient/YavscClient.csproj index 3387d6da..d8e4204b 100644 --- a/yavscclient/YavscClient.csproj +++ b/yavscclient/YavscClient.csproj @@ -22,7 +22,6 @@ false true bin\Debug\yavscclient.xml - v4.5     full @@ -32,13 +31,11 @@ 4 false true - v4.5 false bin\Lua 4 - v4.5 false