Uncommitted Updates
This commit is contained in:
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -9,7 +9,7 @@ namespace InventoryTraker.Web.ActionResults
|
||||
{
|
||||
public class BetterJsonResult : JsonResult
|
||||
{
|
||||
public IList<string> ErrorMessages { get; private set; }
|
||||
public IList<string> ErrorMessages { get; }
|
||||
|
||||
public BetterJsonResult()
|
||||
{
|
||||
|
||||
@@ -212,5 +212,11 @@ namespace InventoryTraker.Web.Controllers
|
||||
return BetterJson(_mapper.Map<InventoryViewModel>(inventory));
|
||||
}
|
||||
|
||||
[ActionLog]
|
||||
public JsonResult Update(InventoryTypeViewModel form)
|
||||
{
|
||||
// TODO: add update stuff
|
||||
return BetterJson(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt
|
||||
<ExcludeApp_Data>False</ExcludeApp_Data>
|
||||
<DesktopBuildPackageLocation>C:\Users\poprhythm\Documents\code\PublishPackages\InventoryTraker.Web.zip</DesktopBuildPackageLocation>
|
||||
<PackageAsSingleFile>true</PackageAsSingleFile>
|
||||
<DeployIisAppPath>Default Web Site</DeployIisAppPath>
|
||||
<DeployIisAppPath>InventoryTraker</DeployIisAppPath>
|
||||
<PublishDatabaseSettings>
|
||||
<Objects xmlns="">
|
||||
<ObjectGroup Name="DefaultConnection" Order="1" Enabled="True">
|
||||
|
||||
@@ -5,7 +5,11 @@
|
||||
|
||||
<div ng-controller="DistributionReportController as vm">
|
||||
<h1 class="page-header">
|
||||
<i class="fa fa-file-o"></i> @ViewBag.Title
|
||||
<span class="fa-stack" style="font-size: 50%">
|
||||
<i class="fa fa-file-o fa-stack-2x"></i>
|
||||
<i class="fa fa-share-square fa-stack-1x"></i>
|
||||
</span>
|
||||
@ViewBag.Title
|
||||
</h1>
|
||||
<div class="row hidden-print">
|
||||
<div class="col-md-9">
|
||||
|
||||
@@ -5,7 +5,11 @@
|
||||
|
||||
<div ng-controller="MovementReportController as vm">
|
||||
<h1 class="page-header">
|
||||
<i class="fa fa-file-o"></i> @ViewBag.Title
|
||||
<span class="fa-stack" style="font-size: 50%">
|
||||
<i class="fa fa-file-o fa-stack-2x"></i>
|
||||
<i class="fa fa-cubes fa-stack-1x"></i>
|
||||
</span>
|
||||
@ViewBag.Title
|
||||
</h1>
|
||||
<div class="row hidden-print">
|
||||
<div class="col-md-4">
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
{
|
||||
<footer class="footer hidden-print">
|
||||
<div class="container">
|
||||
<p>Inventory Traker © 2016 Kolpack Software Consulting LLC</p>
|
||||
<p>Inventory Traker © ETHRA, 2016 Kolpack Software Consulting LLC</p>
|
||||
</div>
|
||||
</footer>
|
||||
}
|
||||
|
||||
@@ -1,6 +1,4 @@
|
||||
@using InventoryTraker.Web.Helpers
|
||||
@using InventoryTraker.Web.Models
|
||||
@model dynamic
|
||||
@model dynamic
|
||||
|
||||
@{
|
||||
ViewBag.Title = "Inventory";
|
||||
@@ -8,7 +6,7 @@
|
||||
|
||||
<div ng-controller="TransactionController as vm">
|
||||
<h1 class="page-header">
|
||||
Transaction History
|
||||
<i class="fa fa-fw fa-list"></i> Transaction History
|
||||
</h1>
|
||||
<div class="pull-right">
|
||||
</div>
|
||||
|
||||
@@ -106,5 +106,7 @@
|
||||
<remove name="TRACEVerbHandler" />
|
||||
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
|
||||
</handlers>
|
||||
<!-- http://stackoverflow.com/a/4029197/99492 -->
|
||||
<httpErrors existingResponse="PassThrough"></httpErrors>
|
||||
</system.webServer>
|
||||
</configuration>
|
||||
@@ -47,9 +47,10 @@
|
||||
}
|
||||
|
||||
function update(existingInventory, updatedInventory) {
|
||||
|
||||
return $http.post("/Inventory/Update", updatedInventory)
|
||||
.success(function(inventory) {
|
||||
angular.extend(existingInventory, inventory);
|
||||
//angular.extend(existingInventory, inventory);
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -52,10 +52,22 @@
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<error-list errors="vm.errorMessages"></error-list>
|
||||
</div>
|
||||
|
||||
@*<div>
|
||||
<ul>
|
||||
<li ng-repeat="(key, errors) in vm.form.$error track by $index">
|
||||
<strong>{{ key }}</strong> errors
|
||||
<ul>
|
||||
<li ng-repeat="e in errors">{{ e.$name }} has an error: <strong>{{ key }}</strong>.</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</div>*@
|
||||
|
||||
<div class="modal-footer">
|
||||
<button class="btn btn-success" ng-disabled="vm.form.$invalid || vm.form.$pristine">Save</button>
|
||||
<button class="btn btn-success" @*ng-disabled="vm.form.$invalid || vm.form.$pristine"*@>Save</button>
|
||||
<button type="button" class="btn" ng-click="$dismiss()">Cancel</button>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
<div class="modal-footer">
|
||||
<button ng-click="vm.removeInventory()" class="btn btn-sm pull-left"><i class="fa fa-minus-circle"></i> Remove Inventory</button>
|
||||
<button class="btn btn-success" ng-disabled="vm.form.$invalid || vm.form.$pristine">Save</button>
|
||||
<button type="button" class="btn" ng-click="$parent.$dismiss()">Cancel</button>
|
||||
<button type="button" class="btn" ng-click="$parent.$dismiss()">Close</button>
|
||||
</div>
|
||||
|
||||
<hr />
|
||||
|
||||
Reference in New Issue
Block a user