refactoring: --YavscLib-- => Yavsc

This commit is contained in:
2017-05-27 16:22:58 +02:00
parent e07c06b32e
commit 2a8b078024
102 changed files with 218 additions and 211 deletions

View File

@ -1,4 +1,4 @@
namespace YavscLib
namespace Yavsc
{
public interface IAccountBalance
{

View File

@ -1,4 +1,4 @@
namespace YavscLib.Billing
namespace Yavsc.Billing
{
public interface IBillItem {
string Name { get; set; }

View File

@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace YavscLib.Billing
namespace Yavsc.Billing
{
public interface IBillable {
string Description { get; set; }

View File

@ -1,5 +1,5 @@
namespace YavscLib.Billing
namespace Yavsc.Billing
{
public interface IBillingImpacter { 
decimal Impact(decimal orgValue);

View File

@ -1,4 +1,5 @@
namespace YavscLib.Billing
namespace Yavsc.Billing
{
public interface ICommandLine : IBillItem

View File

@ -1,4 +1,4 @@
namespace YavscLib.Workflow
namespace Yavsc
{
using System.Collections.Generic;
public interface IEstimate
@ -14,4 +14,4 @@
string Title { get; set; }
}
}
}

View File

@ -1,7 +1,7 @@

using YavscLib.Interfaces;
namespace YavscLib
namespace Yavsc
{
public interface IBlog : IBaseTrackedEntity, IIdentified<long>, IRating<long>, ITitle
{

View File

@ -1,6 +1,6 @@
using System;
namespace YavscLib
namespace Yavsc
{
public interface IBaseTrackedEntity
{

View File

@ -19,7 +19,7 @@
// 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/>.
namespace YavscLib
namespace Yavsc
{
/// <summary>
/// I identified.

View File

@ -1,6 +1,6 @@
using System.Collections.Generic;
namespace YavscLib
namespace Yavsc
{
public interface ILetter<T> : IEqualityComparer<T> {
}
@ -19,4 +19,4 @@ namespace YavscLib
IWord<TLetter> CreateWord(TLetter letter);
}
}
}

View File

@ -18,7 +18,7 @@
//
// 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/>.
namespace YavscLib
namespace Yavsc
{
public interface ITitle
{

View File

@ -1,4 +1,4 @@
namespace YavscLib
namespace Yavsc
{
public interface IApplicationUser
{

View File

@ -1,4 +1,4 @@
namespace YavscLib
namespace Yavsc
{
public interface IConnection
{
@ -18,4 +18,4 @@ namespace YavscLib
string[] Roles { get; set; }
}
}
}

View File

@ -1,8 +1,8 @@
namespace YavscLib
namespace Yavsc
{
public interface ICircleAuthorization
{
{
long CircleId { get; set; }
}
}
}

View File

@ -1,11 +1,11 @@
namespace YavscLib
namespace Yavsc
{
public interface ICircleAuthorized
{
long Id { get; set; }
string GetOwnerId ();
bool AuthorizeCircle(long circleId);
ICircleAuthorization [] GetACL();
ICircleAuthorization [] GetACL();
}
}
}

View File

@ -1,6 +1,6 @@
using System;
namespace YavscLib
namespace Yavsc
{
public interface IActivity
{

View File

@ -1,10 +1,10 @@
namespace YavscLib
namespace Yavsc
{
public interface ICoWorking
{
long Id {get; set; }
string PerformerId { get; set; }
string WorkingForId { get; set; }
}
}
}

View File

@ -1,11 +1,11 @@
namespace YavscLib
namespace Yavsc
{
public interface ICommandForm
{
long Id { get; set; }
string ActionName { get; set; }
string Title { get; set; }
string Title { get; set; }
string ActivityCode { get; set; }
}
}
}

View File

@ -1,4 +1,4 @@
namespace YavscLib
namespace Yavsc
{
public interface IContact
{

View File

@ -1,24 +1,24 @@
// Copyright (C) 2016 Paul Schneider
//
//
// This file is part of yavsc.
//
//
// yavsc is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 2 of the License, or
// (at your option) any later version.
//
//
// yavsc 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 General Public License for more details.
//
//
// You should have received a copy of the GNU General Public License
// along with yavsc. If not, see <http://www.gnu.org/licenses/>.
//
//
using System;
namespace YavscLib
namespace Yavsc
{
public interface IGCMDeclaration
{

View File

@ -1,4 +1,4 @@
namespace YavscLib
namespace Yavsc
{
public interface ILocation
{

View File

@ -1,4 +1,4 @@
namespace YavscLib.Workflow
namespace Yavsc.Workflow
{
public interface IPerformerProfile
{
@ -14,4 +14,4 @@ namespace YavscLib.Workflow
int? MinDailyCost { get; set; }
int Rate { get; set; }
}
}
}

View File

@ -1,7 +1,7 @@
namespace YavscLib.Workflow
namespace Yavsc.Workflow
{
using YavscLib;
using YavscLib.Billing;
using Yavsc;
using Yavsc.Billing;
public interface IQuery: IBaseTrackedEntity, IBillable
{

View File

@ -19,7 +19,7 @@
// 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/>.
namespace YavscLib.Interfaces
namespace Yavsc
{
/// <summary>

View File

@ -1,7 +1,7 @@
namespace YavscLib
namespace Yavsc
{
public interface ISpecializationSettings
{
string UserId { get ; set ; }
}
}
}

View File

@ -1,4 +1,4 @@
namespace YavscLib
namespace Yavsc
{
/// <summary>
/// Status,

View File

@ -8,8 +8,8 @@
<ProjectGuid>{67F9D3A8-F71E-4428-913F-C37AE82CDB24}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Yavsc.Client</RootNamespace>
<AssemblyName>Yavsc.Client</AssemblyName>
<RootNamespace>Yavsc</RootNamespace>
<AssemblyName>Yavsc.Abstract</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile111</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
@ -73,11 +73,17 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<ItemGroup>
<Compile Include="Billing\IAccountBalance.cs" />
<Compile Include="Billing\IcommandLine.cs" />
<Compile Include="Billing\IEstimate.cs" />
<Compile Include="Blogspot\IBlog.cs" />
<Compile Include="IBaseTrackedEntity.cs" />
<Compile Include="IIdentified.cs" />
<Compile Include="ITitle.cs" />
<Compile Include="Billing\IAccountBalance.cs" />
<Compile Include="Billing\IBillable.cs" />
<Compile Include="Billing\IBillingImpacter.cs" />
<Compile Include="Billing\IBillItem.cs" />
<Compile Include="Billing\ICommandLine.cs" />
<Compile Include="Billing\IEstimate.cs" />
<Compile Include="Workflow\IRating.cs" />
<Compile Include="Blogspot\IBlog.cs" />
<Compile Include="Identity\IApplicationUser.cs" />
<Compile Include="Identity\IChatUserInfo.cs" />
<Compile Include="Identity\Security\ICircleAuthorization.cs" />

View File

@ -6,7 +6,7 @@ using Microsoft.Extensions.Localization;
namespace Yavsc.ApiControllers
{
using YavscLib;
using Yavsc;
using System;
using System.Linq;
using System.Security.Claims;

View File

@ -20,7 +20,7 @@ using Microsoft.Data.Entity;
namespace Yavsc.Controllers
{
[AllowAnonymous]
public class AccountController : Controller
{
private readonly UserManager<ApplicationUser> _userManager;
@ -61,6 +61,13 @@ namespace Yavsc.Controllers
_dbContext = dbContext;
}
[Authorize(Roles=Constants.AdminGroupName)]
public async Task<IActionResult> UserList ()
{
return View(await _dbContext.Users.ToArrayAsync());
}
[AllowAnonymous]
[HttpGet(Constants.LoginPath)]
public ActionResult SignIn(string returnUrl = null)
{
@ -79,6 +86,7 @@ namespace Yavsc.Controllers
*/
}
[AllowAnonymous]
public ActionResult AccessDenied(string requestUrl = null)
{
ViewBag.UserIsSignedIn = User.IsSignedIn();
@ -89,6 +97,7 @@ namespace Yavsc.Controllers
return View("AccessDenied",requestUrl);
}
[AllowAnonymous]
[HttpPost(Constants.LoginPath)]
public async Task<IActionResult> SignIn(SignInViewModel model)
{
@ -169,6 +178,7 @@ namespace Yavsc.Controllers
//
// GET: /Account/Register
[AllowAnonymous]
[HttpGet]
public IActionResult Register()
{
@ -178,6 +188,7 @@ namespace Yavsc.Controllers
//
// POST: /Account/Register
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
public async Task<IActionResult> Register(RegisterViewModel model)
{
@ -220,6 +231,7 @@ namespace Yavsc.Controllers
//
// GET: /Account/ExternalLoginCallback
[HttpGet]
[AllowAnonymous]
public async Task<IActionResult> ExternalLoginCallback(string returnUrl = null)
{
var info = await _signInManager.GetExternalLoginInfoAsync();
@ -285,6 +297,7 @@ namespace Yavsc.Controllers
// POST: /Account/ExternalLoginConfirmation
[HttpPost]
[ValidateAntiForgeryToken]
[AllowAnonymous]
public async Task<IActionResult> ExternalLoginConfirmation(ExternalLoginConfirmationViewModel model, string returnUrl = null)
{
if (User.IsSignedIn())
@ -324,6 +337,7 @@ namespace Yavsc.Controllers
// GET: /Account/ConfirmEmail
[HttpGet]
[AllowAnonymous]
public async Task<IActionResult> ConfirmEmail(string userId, string code)
{
if (userId == null || code == null)
@ -342,6 +356,7 @@ namespace Yavsc.Controllers
//
// GET: /Account/ForgotPassword
[HttpGet]
[AllowAnonymous]
public IActionResult ForgotPassword()
{
return View();
@ -350,6 +365,7 @@ namespace Yavsc.Controllers
//
// POST: /Account/ForgotPassword
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
public async Task<IActionResult> ForgotPassword(ForgotPasswordViewModel model)
{
@ -382,6 +398,7 @@ namespace Yavsc.Controllers
//
// GET: /Account/ForgotPasswordConfirmation
[HttpGet]
[AllowAnonymous]
public IActionResult ForgotPasswordConfirmation()
{
return View();
@ -390,6 +407,7 @@ namespace Yavsc.Controllers
//
// GET: /Account/ResetPassword
[HttpGet]
[AllowAnonymous]
public IActionResult ResetPassword(string UserId, string code = null)
{
return code == null ? View("Error") : View();
@ -398,6 +416,7 @@ namespace Yavsc.Controllers
//
// POST: /Account/ResetPassword
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
public async Task<IActionResult> ResetPassword(ResetPasswordViewModel model)
{
@ -423,6 +442,7 @@ namespace Yavsc.Controllers
//
// GET: /Account/ResetPasswordConfirmation
[HttpGet]
[AllowAnonymous]
public IActionResult ResetPasswordConfirmation()
{
return View();
@ -489,6 +509,7 @@ namespace Yavsc.Controllers
//
// GET: /Account/VerifyCode
[HttpGet]
[AllowAnonymous]
public async Task<IActionResult> VerifyCode(string provider, bool rememberMe, string returnUrl = null)
{
// Require that the user has already logged in via username/password or external login
@ -503,6 +524,7 @@ namespace Yavsc.Controllers
//
// POST: /Account/VerifyCode
[HttpPost]
[AllowAnonymous]
[ValidateAntiForgeryToken]
public async Task<IActionResult> VerifyCode(VerifyCodeViewModel model)
{

View File

@ -81,6 +81,7 @@ namespace Yavsc.Controllers
{
var adminCount = await _userManager.GetUsersInRoleAsync(
Constants.AdminGroupName);
var userCount = await context.Users.CountAsync();
var youAreAdmin = await _userManager.IsInRoleAsync(
await _userManager.FindByIdAsync(User.GetUserId()),
Constants.AdminGroupName);
@ -98,7 +99,8 @@ namespace Yavsc.Controllers
{
Roles = roles.ToArray(),
AdminCount = adminCount.Count,
YouAreAdmin = youAreAdmin
YouAreAdmin = youAreAdmin,
UserCount = userCount
});
}

View File

@ -12,7 +12,7 @@ namespace Yavsc.Controllers
using Models.Workflow;
using Yavsc.Exceptions;
using Yavsc.ViewModels.Workflow;
using YavscLib;
using Yavsc;
[Authorize]
public class DoController : Controller
@ -22,7 +22,7 @@ namespace Yavsc.Controllers
public DoController(ApplicationDbContext context,ILogger<DoController> logger)
{
_context = context;
_context = context;
_logger = logger;
}
@ -42,7 +42,7 @@ namespace Yavsc.Controllers
// GET: Do/Details/5
public IActionResult Details(string id, string activityCode)
{
if (id == null || activityCode == null)
{
return HttpNotFound();
@ -54,20 +54,20 @@ namespace Yavsc.Controllers
{
return HttpNotFound();
}
bool hasConfigurableSettings = (userActivity.Does.SettingsClassName != null);
if (hasConfigurableSettings) {
ViewBag.ProfileType = Startup.ProfileTypes.Single(t=>t.FullName==userActivity.Does.SettingsClassName);
var dbset = (IQueryable<ISpecializationSettings>) _context.GetDbSet(userActivity.Does.SettingsClassName);
if (dbset == null) throw new InvalidWorkflowModelException($"pas de db set pour {userActivity.Does.SettingsClassName}, vous avez peut-être besoin de décorer votre propriété avec l'attribut [ActivitySettings]");
return View(new UserActivityViewModel {
Declaration = userActivity,
return View(new UserActivityViewModel {
Declaration = userActivity,
HasSettings = dbset.Any(ua=>ua.UserId==id),
NeedsSettings = hasConfigurableSettings
} );
}
return View(new UserActivityViewModel {
Declaration = userActivity,
return View(new UserActivityViewModel {
Declaration = userActivity,
HasSettings = false,
NeedsSettings = hasConfigurableSettings
} );

View File

@ -5,7 +5,7 @@ using Microsoft.AspNet.Mvc;
using Microsoft.Data.Entity;
using Yavsc.Exceptions;
using Yavsc.Models;
using YavscLib;
using Yavsc;
namespace Yavsc.Controllers.Generic
{
@ -15,7 +15,7 @@ namespace Yavsc.Controllers.Generic
protected ApplicationDbContext _context;
private object dbSet;
protected DbSet<TSettings> Settings { get {
protected DbSet<TSettings> Settings { get {
return (DbSet<TSettings>) dbSet;
} }
@ -47,7 +47,7 @@ namespace Yavsc.Controllers.Generic
return View(profile);
}
// GET: BrusherProfile/Create
public IActionResult Create()
@ -71,7 +71,7 @@ namespace Yavsc.Controllers.Generic
return View(setting);
}
// GET: BrusherProfile/Delete/5
[ActionName("Delete")]
@ -106,7 +106,7 @@ namespace Yavsc.Controllers.Generic
}
return View("Edit",settings);
}
// POST: FormationSettings/Edit/5
[HttpPost]
[ValidateAntiForgeryToken]
@ -115,7 +115,7 @@ namespace Yavsc.Controllers.Generic
if (settings.UserId == null) {
settings.UserId = User.GetUserId();
Settings.Add(settings);
} else
} else
_context.Update(settings);
if (ModelState.IsValid)
{
@ -124,7 +124,7 @@ namespace Yavsc.Controllers.Generic
}
return View(settings);
}
// POST: FormationSettings/Delete/5
[HttpPost, ActionName("Delete")]
[ValidateAntiForgeryToken]
@ -137,4 +137,4 @@ namespace Yavsc.Controllers.Generic
}
}
}
}

View File

@ -14,7 +14,7 @@ using System.Threading.Tasks;
namespace Yavsc.Controllers
{
using Models;
using YavscLib;
using Yavsc;
[AllowAnonymous]
public class HomeController : Controller

View File

@ -1,6 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using YavscLib.Billing;
using Yavsc.Billing;
namespace Yavsc.Helpers
{

View File

@ -19,10 +19,10 @@ namespace Yavsc.Helpers
public TeXString(string str) : base(str)
{
}
}
public class Replacement
@ -41,7 +41,7 @@ namespace Yavsc.Helpers
}
public static class TeXHelpers
{
public static readonly Replacement[] SpecialCharsRendering =
public static readonly Replacement[] SpecialCharsDefaultRendering =
{
new Replacement("<","\\textless"),
new Replacement(">","\\textgreater"),
@ -70,7 +70,7 @@ namespace Yavsc.Helpers
public static TeXString ToTeX(this string source)
{
string result=source;
foreach (var r in SpecialCharsRendering)
foreach (var r in SpecialCharsDefaultRendering)
{
result = r.Execute(result);
}
@ -172,4 +172,4 @@ namespace Yavsc.Helpers
}
}
}
}
}

View File

@ -1,4 +1,4 @@
using YavscLib;
using Yavsc
namespace Yavsc.Interfaces
{
@ -7,4 +7,4 @@ namespace Yavsc.Interfaces
ICircle Circle { get; set; }
IApplicationUser Member { get; set; }
}
}
}

View File

@ -1,5 +1,4 @@
using YavscLib;

namespace Yavsc.Interfaces
{
public interface IGCMDeclaration
@ -17,4 +16,4 @@ namespace Yavsc.Interfaces
IApplicationUser DeviceOwner { get; set; }
string DeviceOwnerId { get; set; }
}
}
}

View File

@ -1,4 +1,4 @@
using YavscLib.Billing;
using Yavsc.Billing;
namespace Yavsc.Models.Billing {
public interface IBillingClause { 

View File

@ -2,7 +2,7 @@ using Microsoft.Data.Entity.Migrations;
namespace Yavsc.Migrations
{
using YavscLib;
using Yavsc;
public partial class bookQueryStatus : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)

View File

@ -4,13 +4,13 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace Yavsc.Models.Access
{
using YavscLib;
using Yavsc;
public class Ban : IBaseTrackedEntity
{
public DateTime DateCreated
{
get; set;
get; set;
}
public DateTime DateModified

View File

@ -3,7 +3,7 @@ namespace Yavsc.Models.Access
using System.ComponentModel.DataAnnotations.Schema;
using Models.Relationship;
using Newtonsoft.Json;
using YavscLib;
using Yavsc;
public class CircleAuthorizationToBlogPost : ICircleAuthorization
{
@ -19,4 +19,4 @@ namespace Yavsc.Models.Access
public virtual Circle Allowed { get; set; }
}
}
}

View File

@ -12,7 +12,7 @@ namespace Yavsc.Models
{
using Relationship;
using Forms;
using YavscLib;
using Yavsc;
using Auth;
using Billing;
using Musical;

View File

@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace Yavsc.Models
{
using YavscLib;
using Yavsc;
public partial class AccountBalance: IAccountBalance {
[Key]

View File

@ -5,7 +5,7 @@ using Newtonsoft.Json;
namespace Yavsc.Models.Billing
{
using YavscLib.Billing;
using Yavsc.Billing;
public class CommandLine : ICommandLine {

View File

@ -9,7 +9,7 @@ namespace Yavsc.Models.Billing
{
using Models.Workflow;
using Newtonsoft.Json;
using YavscLib.Workflow;
using Yavsc.Workflow;
public partial class Estimate : IEstimate
{

View File

@ -1,4 +1,4 @@
using YavscLib.Billing;
using Yavsc.Billing;
namespace Yavsc.Models.Billing   {
public class FixedImpacter : IBillingImpacter

View File

@ -8,9 +8,9 @@ namespace Yavsc.Models.Billing
using Newtonsoft.Json;
using Workflow;
using Yavsc.Models.Payment;
using YavscLib;
using YavscLib.Billing;
using YavscLib.Workflow;
using Yavsc;
using Yavsc.Billing;
using Yavsc.Workflow;
public abstract class NominativeServiceCommand : IBaseTrackedEntity, IQuery, IIdentified<long>
{

View File

@ -1,4 +1,4 @@
using YavscLib.Billing;
using Yavsc.Billing;
namespace Yavsc.Models.Billing   {
public class ProportionalImpacter : IBillingImpacter

View File

@ -1,7 +1,7 @@
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using YavscLib.Billing;
using Yavsc.Billing;
namespace Yavsc.Models.Billing {

View File

@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations.Schema;
using System.Linq;
using Newtonsoft.Json;
using Yavsc.Models.Access;
using YavscLib;
using Yavsc;
namespace Yavsc.Models
{
@ -27,7 +27,7 @@ namespace Yavsc.Models
public string AuthorId { get; set; }
[Display(Name="Auteur")]
[ForeignKey("AuthorId"),JsonIgnore]
public ApplicationUser Author { set; get; }
[Display(Name="Visible")]
@ -56,7 +56,7 @@ namespace Yavsc.Models
{
get; set;
}
[InverseProperty("Target")]
[Display(Name="Liste de contrôle d'accès")]
public virtual List<CircleAuthorizationToBlogPost> ACL { get; set; }

View File

@ -4,7 +4,7 @@ using Newtonsoft.Json;
namespace Yavsc.Models.Chat
{
using YavscLib;
using Yavsc;
public class Connection : IConnection
{
@ -18,5 +18,5 @@ namespace Yavsc.Models.Chat
public string UserAgent { get; set; }
public bool Connected { get; set; }
}
}

View File

@ -2,7 +2,7 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Newtonsoft.Json;
using Yavsc.Models.Workflow;
using YavscLib;
using Yavsc;
namespace Yavsc.Models.Haircut
{

View File

@ -5,7 +5,7 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Yavsc.Models.Billing;
using Yavsc.Models.Relationship;
using YavscLib.Billing;
using Yavsc.Billing;
namespace Yavsc.Models.Haircut
{

View File

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Yavsc.Models.Billing;
using Yavsc.Models.Relationship;
using YavscLib.Billing;
using Yavsc.Billing;
namespace Yavsc.Models.Haircut
{

View File

@ -1,5 +1,5 @@
using System;
namespace YavscLib.Haircut
namespace Yavsc.Haircut
{
public interface IProviderInfo
{

View File

@ -1,4 +1,4 @@
namespace YavscLib
namespace Yavsc
{
public interface IHairPrestation
{

View File

@ -2,7 +2,7 @@ using System;
using System.ComponentModel.DataAnnotations;
using Yavsc.Models.Auth;
using Yavsc.Models.Relationship;
using YavscLib;
using Yavsc;
namespace Yavsc.Models.Haircut.Views
{

View File

@ -1,7 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using YavscLib;
using Yavsc;
namespace Yavsc.Models.IT.Modeling
{
@ -37,4 +37,4 @@ namespace Yavsc.Models.IT.Modeling
public abstract IWord<TLetter> CreateWord(TLetter letter);
}
}
}

View File

@ -1,5 +1,5 @@
using YavscLib;
using Yavsc;
namespace Yavsc.Models.IT.Modeling
{
@ -13,4 +13,4 @@ namespace Yavsc.Models.IT.Modeling
}
}
}
}

View File

@ -5,19 +5,19 @@ using Newtonsoft.Json;
namespace Yavsc.Models.Identity
{
using YavscLib;
using Yavsc;
[JsonObject]
public class GivenGoogleCloudMobileDeclaration : GoogleCloudMobileDeclaration, IGCMDeclaration {
public class GivenGoogleCloudMobileDeclaration : GoogleCloudMobileDeclaration, IGCMDeclaration {
public DateTime? LatestActivityUpdate { get; set; }
}
public class GoogleCloudMobileDeclaration {
[Required]
public string GCMRegistrationId { get; set; }
[Key,Required]
public string DeviceId { get; set; }
@ -27,8 +27,8 @@ namespace Yavsc.Models.Identity
public string DeviceOwnerId { get; set; }
public DateTime DeclarationDate { get; set; }
[JsonIgnore,ForeignKey("DeviceOwnerId")]
public virtual ApplicationUser DeviceOwner { get; set; }
public virtual ApplicationUser DeviceOwner { get; set; }
}

View File

@ -24,7 +24,7 @@ using System.ComponentModel.DataAnnotations;
namespace Yavsc.Models.Messaging
{
using Interfaces.Workflow;
using YavscLib;
using Yavsc;
/// <summary>
/// Base event.

View File

@ -1,6 +1,6 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using YavscLib;
using Yavsc;
namespace Yavsc.Models.Musical.Profiles
{
@ -18,4 +18,4 @@ namespace Yavsc.Models.Musical.Profiles
}
}
}
}

View File

@ -1,6 +1,6 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using YavscLib;
using Yavsc;
namespace Yavsc.Models.Musical.Profiles
{
@ -13,4 +13,4 @@ namespace Yavsc.Models.Musical.Profiles
get; set;
}
}
}
}

View File

@ -1,6 +1,6 @@
using System.ComponentModel.DataAnnotations.Schema;
using Yavsc.Models.Workflow;
using YavscLib;
using Yavsc;
namespace Yavsc.Models.Musical.Profiles
{
@ -10,7 +10,7 @@ namespace Yavsc.Models.Musical.Profiles
{
get; set;
}
[ForeignKeyAttribute("UserId")]
public virtual PerformerProfile User { get; set; }
public long InstrumentId { get; set; }
@ -18,4 +18,4 @@ namespace Yavsc.Models.Musical.Profiles
[ForeignKeyAttribute("InstrumentId")]
public virtual Instrument Tool { get; set; }
}
}
}

View File

@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
namespace Yavsc.Models.Payment {
using YavscLib;
using Yavsc;
using Relationship;
public class PayPalPayment : IBaseTrackedEntity

View File

@ -8,7 +8,7 @@ using Newtonsoft.Json;
namespace Yavsc.Models.Workflow
{
using Yavsc.Models.Market;
using YavscLib;
using Yavsc;
public class Activity : IBaseTrackedEntity, IActivity
{

View File

@ -3,20 +3,20 @@ using System.ComponentModel.DataAnnotations.Schema;
namespace Yavsc.Models.Workflow
{
using YavscLib;
using Yavsc;
public class CoWorking: ICoWorking
{
[Key(), DatabaseGenerated(DatabaseGeneratedOption.Identity)]
public long Id {get; set; }
public string PerformerId { get; set; }
public string WorkingForId { get; set; }
[ForeignKey("PerformerId")]
public virtual PerformerProfile Performer { get; set; }
[ForeignKey("WorkingForId")]
public virtual ApplicationUser WorkingFor { get; set; }
}
}
}

View File

@ -4,7 +4,7 @@ using Newtonsoft.Json;
namespace Yavsc.Models.Workflow
{
using YavscLib;
using Yavsc;
public class CommandForm : ICommandForm
{
[Key,DatabaseGenerated(DatabaseGeneratedOption.Identity)]
@ -12,12 +12,12 @@ namespace Yavsc.Models.Workflow
public string ActionName { get; set; }
public string Title { get; set; }
public string Title { get; set; }
[Required]
public string ActivityCode { get; set; }
[ForeignKey("ActivityCode"),JsonIgnore]
public virtual Activity Context { get; set; }
}
}
}

View File

@ -6,7 +6,7 @@ namespace Yavsc.Models.Workflow
{
using System;
using Models.Relationship;
using YavscLib.Workflow;
using Yavsc.Workflow;
public class PerformerProfile : IPerformerProfile {

View File

@ -4,11 +4,11 @@ using System.ComponentModel.DataAnnotations;
namespace Yavsc.Models.Workflow.Profiles
{
using Models.Workflow;
using YavscLib;
using Yavsc;
public class FormationSettings : ISpecializationSettings
{
public virtual List<CoWorking> CoWorking { get; set; }
[Key]
public string UserId
{
@ -16,4 +16,4 @@ namespace Yavsc.Models.Workflow.Profiles
}
}
}
}

View File

@ -7,7 +7,7 @@ namespace Yavsc.Models.Workflow
using System.Collections.Generic;
using Yavsc.Models.Billing;
using Yavsc.Models.Relationship;
using YavscLib.Billing;
using Yavsc.Billing;
/// <summary>
/// Query, for a date, with a given perfomer, at this given place.

View File

@ -6,7 +6,7 @@ using Microsoft.AspNet.Builder;
using Microsoft.Extensions.Logging;
using Yavsc.Exceptions;
using Yavsc.Models;
using YavscLib;
using Yavsc;
namespace Yavsc
{

View File

@ -4,7 +4,7 @@ using Microsoft.AspNet.Mvc.Rendering;
using Yavsc.Models;
using Yavsc.ViewModels.Controls;
using Yavsc.ViewModels.Relationship;
using YavscLib;
using Yavsc;
namespace Yavsc.ViewComponents
{
@ -16,31 +16,31 @@ namespace Yavsc.ViewComponents
this.dbContext = dbContext;
}
public IViewComponentResult Invoke (ICircleAuthorized target)
{
var oid = target.GetOwnerId();
ViewBag.ACL = dbContext.Circle.Where(
c=>c.OwnerId == oid)
.Select(
c => new SelectListItem
{
Text = c.Name,
Value = c.Id.ToString(),
Selected = target.AuthorizeCircle(c.Id)
c => new SelectListItem
{
Text = c.Name,
Value = c.Id.ToString(),
Selected = target.AuthorizeCircle(c.Id)
} 
);
ViewBag.Access = dbContext.Circle.Where(
c=>c.OwnerId == oid)
.Select( c=>
new AjaxCheckBoxInfo
{
Text = c.Name,
Text = c.Name,
Checked = target.AuthorizeCircle(c.Id),
Value = c.Id.ToString()
});
return View(new CirclesViewModel(target));
}
}
}
}

View File

@ -111,7 +111,7 @@
"Microsoft.AspNet.Mvc.Formatters.Json": "6.0.0-rc1-final",
"Microsoft.AspNet.OWin": "1.0.0-rc1-final",
"System.Json": "4.0.20126.16343",
"YavscLib": {
"Yavsc.Abstract": {
"type": "build",
"version": "1.0.0"
},

View File

@ -2851,7 +2851,7 @@
"lib/WebGrease.dll": {}
}
},
"YavscLib/1.0.0": {
"Yavsc.Abstract/1.0.0": {
"type": "project",
"framework": ".NETFramework,Version=v4.5.1",
"dependencies": {
@ -5720,7 +5720,7 @@
"lib/WebGrease.dll": {}
}
},
"YavscLib/1.0.0": {
"Yavsc.Abstract/1.0.0": {
"type": "project",
"framework": ".NETFramework,Version=v4.5.1",
"dependencies": {
@ -8589,7 +8589,7 @@
"lib/WebGrease.dll": {}
}
},
"YavscLib/1.0.0": {
"Yavsc.Abstract/1.0.0": {
"type": "project",
"framework": ".NETFramework,Version=v4.5.1",
"dependencies": {
@ -8611,9 +8611,9 @@
}
},
"libraries": {
"YavscLib/1.0.0": {
"Yavsc.Abstract/1.0.0": {
"type": "project",
"path": "../YavscLib/project.json"
"path": "../Yavsc.Abstract/project.json"
},
"Antlr/3.4.1.9004": {
"type": "package",
@ -11622,7 +11622,7 @@
"Microsoft.AspNet.Mvc.Formatters.Json >= 6.0.0-rc1-final",
"Microsoft.AspNet.OWin >= 1.0.0-rc1-final",
"System.Json >= 4.0.20126.16343",
"YavscLib >= 1.0.0",
"Yavsc.Abstract >= 1.0.0",
"Extensions.AspNet.Authentication.Instagram >= 1.0.0-t150809211713",
"Microsoft.AspNet.Http.Extensions >= 1.0.0-rc1-final",
"Microsoft.DiaSymReader.Native >= 1.5.0",

View File

@ -1,23 +0,0 @@
<Properties>
<MonoDevelop.Ide.Workbench ActiveDocument="IBlog.cs">
<Files>
<File FileName="IBlog.cs" Line="1" Column="1" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="Yavsc.Client" expanded="True">
<Node name="Yavsc.Client" expanded="True">
<Node name="References" expanded="True" />
</Node>
</Node>
</State>
</Pad>
</Pads>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
</Properties>

View File

@ -9,7 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZicMoove.iOS", "ZicMoove\Zi
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZicMoove", "ZicMoove\ZicMoove\ZicMoove.csproj", "{A0815650-0A0A-47B0-8826-771F0E1AD137}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YavscLib", "YavscLib\YavscLib.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YavscLib", "Yavsc.Abstract\YavscLib.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

View File

@ -40,7 +40,7 @@ namespace ZicMoove
using System.Net.Http;
using System.Text;
using Pages.ClientPages;
using YavscLib;
using Yavsc;
using Model.Musical;
public partial class App : Application // superclass new in 1.3
@ -135,7 +135,7 @@ namespace ZicMoove
private void OnAppResumed(object sender, EventArgs e)
{
StartConnexion();
// TODO restore the navigation stack
// TODO restore the navigation stack
base.OnResume();
foreach (var pageState in DataManager.Instance.AppState)
{
@ -153,7 +153,7 @@ namespace ZicMoove
DataManager.Instance.AppState.SaveEntity();
}
// FIXME Not called?
// FIXME Not called?
private void OnRotation(object sender, EventArgs<Orientation> e)
{
@ -179,7 +179,7 @@ namespace ZicMoove
public App(IPlatform instance)
{
// This declaration became obsolete by introduction
// of the XLabs App that
// of the XLabs App that
// refers this instance with
// its application context property
// and is obtained using the `Resolver`
@ -224,7 +224,7 @@ namespace ZicMoove
private void BuildMainPage()
{
// TODO
// in case of App resume,
// in case of App resume,
// do not create new BindingContext's,
// but use those from the AppState property
accChooserPage = new AccountChooserPage();
@ -285,7 +285,7 @@ namespace ZicMoove
masterDetail.Detail = new NavigationPage(homePage);
ToolbarItem tiSetts = new ToolbarItem()
{
// FIXME what for? Priority = 0,
// FIXME what for? Priority = 0,
Text = "Paramètres",
Icon = "ic_corp_icon.png",
Command = new Command(

View File

@ -1,5 +1,5 @@
using System;
using YavscLib;
using Yavsc;
namespace ZicMoove.Model.Auth
{

View File

@ -4,9 +4,9 @@ using System;
namespace ZicMoove.Model.Auth.Account
{
using Yavsc.Models;
using YavscLib;
using Yavsc;
public class GoogleCloudMobileDeclaration
public class GoogleCloudMobileDeclaration
{
public string GCMRegistrationId { get; set; }
public string DeviceId { get; set; }
@ -34,4 +34,4 @@ namespace ZicMoove.Model.Auth.Account
set;
}
}
}
}

View File

@ -1,5 +1,5 @@
using System;
using YavscLib;
using Yavsc;
namespace ZicMoove.Model.Blog
{

View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using YavscLib;
using Yavsc;
namespace ZicMoove.Model.Social.Chat
{

View File

@ -4,7 +4,7 @@ using XLabs.Forms.Mvvm;
namespace ZicMoove.Model.Workflow
{
using YavscLib;
using Yavsc;
public class Activity : ViewModel, IActivity
{
public string Code

View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using YavscLib;
using Yavsc;
namespace ZicMoove.Model.Workflow
{

View File

@ -8,7 +8,7 @@ namespace ZicMoove.Model.Workflow
{
using Data;
using Musical;
using YavscLib.Workflow;
using Yavsc.Workflow;
public partial class Estimate : IEstimate
{
@ -49,7 +49,7 @@ namespace ZicMoove.Model.Workflow
get { return AttachedFiles == null ? null : string.Join(":", AttachedFiles); }
set { AttachedFiles = value.Split(':').ToList(); }
}
public string OwnerId { get; set; }
[JsonIgnore]
public ClientProviderInfo Owner

View File

@ -2,7 +2,7 @@
namespace ZicMoove.Model.Workflow
{
using YavscLib.Billing;
using Yavsc.Billing;
public class BillingLine : ICommandLine
{
public long Id { get; set; }

Some files were not shown because too many files have changed in this diff Show More