Skip to content

Commit

Permalink
Добавил реализацию формирования списка заказов
Browse files Browse the repository at this point in the history
  • Loading branch information
DenisMatiichyk committed Jul 22, 2015
1 parent 26c07e3 commit 39ca3d4
Show file tree
Hide file tree
Showing 25 changed files with 556 additions and 34 deletions.
Binary file added BoublikSystem.v11.suo
Binary file not shown.
Binary file modified BoublikSystem/App_Data/BoublikSystem.mdf
Binary file not shown.
Binary file modified BoublikSystem/App_Data/BoublikSystem_log.ldf
Binary file not shown.
4 changes: 4 additions & 0 deletions BoublikSystem/BoublikSystem.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -179,6 +179,7 @@
<Compile Include="Models\AccountViewModels.cs" />
<Compile Include="Models\IdentityModels.cs" />
<Compile Include="Models\ManageViewModels.cs" />
<Compile Include="Models\Order.cs" />
<Compile Include="Models\UserRoleModels.cs" />
<Compile Include="Models\WayBillModel.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
Expand All @@ -197,6 +198,8 @@
<Content Include="Scripts\jquery-1.10.2.js" />
<Content Include="Scripts\jquery-1.10.2.min.js" />
<None Include="Scripts\jquery.validate-vsdoc.js" />
<Content Include="Scripts\jquery.unobtrusive-ajax.js" />
<Content Include="Scripts\jquery.unobtrusive-ajax.min.js" />
<Content Include="Scripts\jquery.validate.js" />
<Content Include="Scripts\jquery.validate.min.js" />
<Content Include="Scripts\jquery.validate.unobtrusive.js" />
Expand Down Expand Up @@ -252,6 +255,7 @@
<Content Include="Views\Admin\Index.cshtml" />
<Content Include="Views\Cook\ShowProducts.cshtml" />
<Content Include="Views\Cook\CreateWayBill.cshtml" />
<Content Include="Views\Cook\_AddProductToWayBill.cshtml" />
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
Expand Down
19 changes: 15 additions & 4 deletions BoublikSystem/Controllers/CookController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ namespace BoublikSystem.Controllers
public class CookController : Controller
{
ApplicationDbContext context = new ApplicationDbContext();

// GET: Cook
public ActionResult Index()
{
return View();
}


// GET: /cook/WayBill
public ActionResult CreateWayBill()
Expand All @@ -45,17 +46,27 @@ public ActionResult CreateWayBill()
return View(wayBillModel);
}

public ViewResult AddProductToWayBill(int idProduct)
private static List<Product> selectedItems = new List<Product>();
private static Dictionary<Product, double> selectedCountProducts = new Dictionary<Product, double>();
public ActionResult _AddProductToWayBill(int id, int count)
{
return new ViewResult();

var data = context.Products.ToList();

selectedItems.Add(data[id-1]);
selectedCountProducts.Add(selectedItems[id - 1], count);

return PartialView(selectedCountProducts);

}


// GET: /cook/ShowProducts
public ActionResult ShowProducts()
{
return View();
}



private List<SelectListItem> CreateAddresList(List<SalePoint> salesList)
Expand Down
1 change: 1 addition & 0 deletions BoublikSystem/Entities/Product.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,6 @@ public class Product
public string Name { get; set; }
public decimal Price { get; set; }
public string MeasurePoint { get; set; }

}
}
11 changes: 11 additions & 0 deletions BoublikSystem/Models/Order.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;

namespace BoublikSystem.Models
{
public class Order
{
}
}
189 changes: 189 additions & 0 deletions BoublikSystem/Scripts/jquery.unobtrusive-ajax.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,189 @@
/* NUGET: BEGIN LICENSE TEXT
*
* Microsoft grants you the right to use these script files for the sole
* purpose of either: (i) interacting through your browser with the Microsoft
* website or online service, subject to the applicable licensing or use
* terms; or (ii) using the files as included with a Microsoft product subject
* to that product's license terms. Microsoft reserves all other rights to the
* files not expressly granted by Microsoft, whether by implication, estoppel
* or otherwise. Insofar as a script file is dual licensed under GPL,
* Microsoft neither took the code under GPL nor distributes it thereunder but
* under the terms set out in this paragraph. All notices and licenses
* below are for informational purposes only.
*
* NUGET: END LICENSE TEXT */
/*!
** Unobtrusive Ajax support library for jQuery
** Copyright (C) Microsoft Corporation. All rights reserved.
*/

/*jslint white: true, browser: true, onevar: true, undef: true, nomen: true, eqeqeq: true, plusplus: true, bitwise: true, regexp: true, newcap: true, immed: true, strict: false */
/*global window: false, jQuery: false */

(function ($) {
var data_click = "unobtrusiveAjaxClick",
data_target = "unobtrusiveAjaxClickTarget",
data_validation = "unobtrusiveValidation";

function getFunction(code, argNames) {
var fn = window, parts = (code || "").split(".");
while (fn && parts.length) {
fn = fn[parts.shift()];
}
if (typeof (fn) === "function") {
return fn;
}
argNames.push(code);
return Function.constructor.apply(null, argNames);
}

function isMethodProxySafe(method) {
return method === "GET" || method === "POST";
}

function asyncOnBeforeSend(xhr, method) {
if (!isMethodProxySafe(method)) {
xhr.setRequestHeader("X-HTTP-Method-Override", method);
}
}

function asyncOnSuccess(element, data, contentType) {
var mode;

if (contentType.indexOf("application/x-javascript") !== -1) { // jQuery already executes JavaScript for us
return;
}

mode = (element.getAttribute("data-ajax-mode") || "").toUpperCase();
$(element.getAttribute("data-ajax-update")).each(function (i, update) {
var top;

switch (mode) {
case "BEFORE":
top = update.firstChild;
$("<div />").html(data).contents().each(function () {
update.insertBefore(this, top);
});
break;
case "AFTER":
$("<div />").html(data).contents().each(function () {
update.appendChild(this);
});
break;
case "REPLACE-WITH":
$(update).replaceWith(data);
break;
default:
$(update).html(data);
break;
}
});
}

function asyncRequest(element, options) {
var confirm, loading, method, duration;

confirm = element.getAttribute("data-ajax-confirm");
if (confirm && !window.confirm(confirm)) {
return;
}

loading = $(element.getAttribute("data-ajax-loading"));
duration = parseInt(element.getAttribute("data-ajax-loading-duration"), 10) || 0;

$.extend(options, {
type: element.getAttribute("data-ajax-method") || undefined,
url: element.getAttribute("data-ajax-url") || undefined,
cache: !!element.getAttribute("data-ajax-cache"),
beforeSend: function (xhr) {
var result;
asyncOnBeforeSend(xhr, method);
result = getFunction(element.getAttribute("data-ajax-begin"), ["xhr"]).apply(element, arguments);
if (result !== false) {
loading.show(duration);
}
return result;
},
complete: function () {
loading.hide(duration);
getFunction(element.getAttribute("data-ajax-complete"), ["xhr", "status"]).apply(element, arguments);
},
success: function (data, status, xhr) {
asyncOnSuccess(element, data, xhr.getResponseHeader("Content-Type") || "text/html");
getFunction(element.getAttribute("data-ajax-success"), ["data", "status", "xhr"]).apply(element, arguments);
},
error: function () {
getFunction(element.getAttribute("data-ajax-failure"), ["xhr", "status", "error"]).apply(element, arguments);
}
});

options.data.push({ name: "X-Requested-With", value: "XMLHttpRequest" });

method = options.type.toUpperCase();
if (!isMethodProxySafe(method)) {
options.type = "POST";
options.data.push({ name: "X-HTTP-Method-Override", value: method });
}

$.ajax(options);
}

function validate(form) {
var validationInfo = $(form).data(data_validation);
return !validationInfo || !validationInfo.validate || validationInfo.validate();
}

$(document).on("click", "a[data-ajax=true]", function (evt) {
evt.preventDefault();
asyncRequest(this, {
url: this.href,
type: "GET",
data: []
});
});

$(document).on("click", "form[data-ajax=true] input[type=image]", function (evt) {
var name = evt.target.name,
target = $(evt.target),
form = $(target.parents("form")[0]),
offset = target.offset();

form.data(data_click, [
{ name: name + ".x", value: Math.round(evt.pageX - offset.left) },
{ name: name + ".y", value: Math.round(evt.pageY - offset.top) }
]);

setTimeout(function () {
form.removeData(data_click);
}, 0);
});

$(document).on("click", "form[data-ajax=true] :submit", function (evt) {
var name = evt.currentTarget.name,
target = $(evt.target),
form = $(target.parents("form")[0]);

form.data(data_click, name ? [{ name: name, value: evt.currentTarget.value }] : []);
form.data(data_target, target);

setTimeout(function () {
form.removeData(data_click);
form.removeData(data_target);
}, 0);
});

$(document).on("submit", "form[data-ajax=true]", function (evt) {
var clickInfo = $(this).data(data_click) || [],
clickTarget = $(this).data(data_target),
isCancel = clickTarget && clickTarget.hasClass("cancel");
evt.preventDefault();
if (!isCancel && !validate(this)) {
return;
}
asyncRequest(this, {
url: this.action,
type: this.method || "GET",
data: clickInfo.concat($(this).serializeArray())
});
});
}(jQuery));
19 changes: 19 additions & 0 deletions BoublikSystem/Scripts/jquery.unobtrusive-ajax.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 39ca3d4

Please sign in to comment.