Refactorisation du workflow:
le manager devient statique, et les procédures relatives au fichiers utisateur sont uniformisée, que l'utilisateur soit enregistré ou anonyme, que ce soit pour le blogspot, le frontoffice ou le workflow. * YavscModel.csproj: * Commande.cs: * WorkFlowManager.cs: * WebFileSystemManager.cs: * UserFileSystemManager.cs: refactorisation du code, en vue de la mise en place de la commande sans enregistrement du client sur le site. * BasketController.cs: * WorkFlowController.cs: * FrontOfficeController.cs: * FrontOfficeController.cs: Le manager de flux de travaux est devient un objet statique. * FileSystemController.cs: refactorisation du code, en vue de la mise en place de la commande sans enregistrement du client sur le site. * Web.csproj: ajoute les références au déployement des sites * Totem prod * Totem pré Leur configuration n'est pas maintenue sous Git.
This commit is contained in:
parent
77eed811f5
commit
439759cb16
13 changed files with 233 additions and 166 deletions
|
|
@ -31,10 +31,9 @@ namespace Yavsc.Controllers
|
|||
/// Index this instance.
|
||||
/// </summary>
|
||||
[Authorize]
|
||||
public ActionResult Index (string user, string filename)
|
||||
public ActionResult Index (string username, string filename)
|
||||
{
|
||||
WebFileSystemManager fsmgr = new WebFileSystemManager ();
|
||||
var files = fsmgr.GetFiles (user,filename);
|
||||
var files = UserFileSystemManager.GetFiles (username,filename);
|
||||
return View (files);
|
||||
}
|
||||
|
||||
|
|
@ -54,14 +53,12 @@ namespace Yavsc.Controllers
|
|||
/// <param name="filename">Filename.</param>
|
||||
public ActionResult Details (string user, string filename)
|
||||
{
|
||||
WebFileSystemManager fsmgr = new WebFileSystemManager ();
|
||||
FileInfo fi = fsmgr.FileInfo (filename);
|
||||
|
||||
ViewData ["filename"] = filename;
|
||||
// TODO : ensure that we use the default port for
|
||||
// the used sheme
|
||||
ViewData ["url"] = Url.Content("~/users/"+user+"/"+filename);
|
||||
return View (fi);
|
||||
return View (UserFileSystemManager.Detail(user,filename));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -26,21 +26,6 @@ namespace Yavsc.Controllers
|
|||
/// </summary>
|
||||
public class FrontOfficeController : Controller
|
||||
{
|
||||
/// <summary>
|
||||
/// The wfmgr.
|
||||
/// </summary>
|
||||
protected WorkFlowManager wfmgr = null;
|
||||
|
||||
/// <summary>
|
||||
/// Initialize the specified requestContext.
|
||||
/// </summary>
|
||||
/// <param name="requestContext">Request context.</param>
|
||||
protected override void Initialize (System.Web.Routing.RequestContext requestContext)
|
||||
{
|
||||
base.Initialize (requestContext);
|
||||
wfmgr = new WorkFlowManager ();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Index this instance.
|
||||
/// </summary>
|
||||
|
|
@ -68,7 +53,7 @@ namespace Yavsc.Controllers
|
|||
throw new ConfigurationErrorsException ("no redirection to any login page");
|
||||
|
||||
string username = u.UserName;
|
||||
Estimate [] estims = wfmgr.GetUserEstimates (username);
|
||||
Estimate [] estims = WorkFlowManager.GetUserEstimates (username);
|
||||
ViewData ["UserName"] = username;
|
||||
ViewData ["ResponsibleCount"] =
|
||||
Array.FindAll (
|
||||
|
|
@ -88,7 +73,7 @@ namespace Yavsc.Controllers
|
|||
/// <param name="id">Identifier.</param>
|
||||
public ActionResult Get (long estimid)
|
||||
{
|
||||
Estimate f = wfmgr.GetEstimate (estimid);
|
||||
Estimate f = WorkFlowManager.GetEstimate (estimid);
|
||||
if (f == null) {
|
||||
ModelState.AddModelError ("Id", "Wrong Id");
|
||||
return View (new Estimate () { Id=estimid } );
|
||||
|
|
@ -110,7 +95,7 @@ namespace Yavsc.Controllers
|
|||
ViewData ["WABASEWF"] = ViewData ["WebApiBase"] + "/WorkFlow";
|
||||
if (submit == null) {
|
||||
if (model.Id > 0) {
|
||||
Estimate f = wfmgr.GetEstimate (model.Id);
|
||||
Estimate f = WorkFlowManager.GetEstimate (model.Id);
|
||||
if (f == null) {
|
||||
ModelState.AddModelError ("Id", "Wrong Id");
|
||||
return View (model);
|
||||
|
|
@ -136,12 +121,12 @@ namespace Yavsc.Controllers
|
|||
|
||||
if (ModelState.IsValid) {
|
||||
if (model.Id == 0)
|
||||
model = wfmgr.CreateEstimate (
|
||||
model = WorkFlowManager.CreateEstimate (
|
||||
username,
|
||||
model.Client, model.Title, model.Description);
|
||||
else {
|
||||
wfmgr.UpdateEstimate (model);
|
||||
model = wfmgr.GetEstimate (model.Id);
|
||||
WorkFlowManager.UpdateEstimate (model);
|
||||
model = WorkFlowManager.GetEstimate (model.Id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -237,7 +222,7 @@ namespace Yavsc.Controllers
|
|||
[Authorize]
|
||||
public ActionResult Basket ()
|
||||
{
|
||||
return View (wfmgr.GetCommands (Membership.GetUser ().UserName));
|
||||
return View (WorkFlowManager.GetCommands (Membership.GetUser ().UserName));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue