notazof/yavsc
1
1
Fork 0
Code Issues 1 Pull requests Projects 1 Releases 4 Packages Wiki Activity Actions

* packages.config:

Browse source 
* App.master:
* datepair.js:
* Book.aspx:
* datepair.min.js:
* LocalizedText.resx:
* jquery.datepair.js:
* jquery-ui-1.11.4.js:
* jquery.timepicker.js:
* BookQuery.cs:
* jquery-1.11.3.min.js:
* LocalizedText.fr.resx:
* jquery.datepair.min.js:
* WebCatalogExtensions.cs:
* GoogleController.cs:
* LocalizedText.Designer.cs:
* jquery.timepicker.min.js:
* jquery.timepicker.css:
* Text.cs:
* Euro.cs:
* Unit.cs:
* Link.cs:
* Note.cs:
* LocalizedText.fr.Designer.cs:
* Brand.cs:
* Label.cs:
* Scalar.cs:
* FrontOfficeController.cs:
* Period.cs:
* Option.cs:
* Service.cs:
* Catalog.cs:
* Product.cs:
* CheckBox.cs:
* Currency.cs:
* SaleForm.cs:
* TextInput.cs:
* FormInput.cs:
* FilesInput.cs:
* SelectItem.cs:
* FormElement.cs:
* SelectInput.cs:
* RadioButton.cs:
* StockStatus.cs:
* ProductImage.cs:
* CatalogHelper.cs:
* CatalogManager.cs:
* ProductCategory.cs:
* PhysicalProduct.cs:
* ui-icons_ffffff_256x240.png:
* ui-icons_cccccc_256x240.png:
* CatalogProvider.cs:
* ui-icons_a83300_256x240.png:
* ui-icons_222222_256x240.png:
* ui-icons_4b8e0b_256x240.png:
* ui-bg_glass_20_555555_1x400.png:
* ui-bg_glass_40_0078a3_1x400.png:
* ui-bg_glass_40_ffc73d_1x400.png:
* ui-icons_222222_256x240.png:
* ui-icons_a83300_256x240.png:
* ui-icons_cccccc_256x240.png:
* ui-icons_4b8e0b_256x240.png:
* ui-icons_ffffff_256x240.png:
* ui-bg_glass_40_0078a3_1x400.png:
* ui-bg_glass_20_555555_1x400.png:
* ui-bg_inset-soft_30_f58400_1x100.png:
* ui-bg_inset-soft_25_000000_1x100.png:
* ui-bg_glass_40_ffc73d_1x400.png:
* ui-bg_gloss-wave_25_333333_500x100.png:
* ui-bg_highlight-soft_80_eeeeee_1x100.png:
* ui-bg_inset-soft_30_f58400_1x100.png:
* ui-bg_inset-soft_25_000000_1x100.png:
* ui-bg_gloss-wave_25_333333_500x100.png:
* ui-bg_highlight-soft_80_eeeeee_1x100.png:
* CatalogProviderConfigurationElement.cs:
* CatalogProvidersConfigurationSection.cs:
* CatalogProvidersConfigurationCollection.cs: Date pairing at booking,
 Fixes the client side ui, concerning the dates and times

* MyClass.cs:
* WorkFlowManager.cs:
* IContentProvider.cs:
* FrontOfficeController.cs:
* XmlCatalog.cs:
* NpgsqlContentProvider.cs:
* Price.cs:
* XmlCatalogProvider.cs:
* PriceOnItemCount.cs: refactoring: a dedicated name space
  for the catalog

* ChooseADate.aspx: WIP

* Web.csproj: date pairing : includes the javascript modules
This commit is contained in:
Paul Schneider 2015-10-30 15:54:26 +01:00
commit 0a91d3935b
94 changed files with 955 additions and 297 deletions
Download patch file Download diff file Expand all files Collapse all files

1
web/Controllers/FrontOfficeController.cs
View file

@ -15,6 +15,7 @@ using Yavsc.Model.FileSystem;
using Yavsc.Model.Calendar;
using System.Configuration;
using Yavsc.Helpers;
using Yavsc.Model.FrontOffice.Catalog;
namespace Yavsc.Controllers
{

10
web/Controllers/GoogleController.cs
View file

@ -314,10 +314,10 @@ namespace Yavsc.Controllers
{
if (ModelState.IsValid) {
DateTime mindate = DateTime.Now;
if (model.PreferedDate < mindate)
model.PreferedDate = mindate;
if (model.MaxDate < mindate)
model.MaxDate = mindate.AddYears (1).Date;
if (model.StartDate < mindate)
model.StartDate = mindate;
if (model.EndDate < mindate)
model.EndDate = mindate.AddYears (1).Date;
var muc = Membership.FindUsersByName (model.Person);
if (muc.Count == 0) {
@ -336,7 +336,7 @@ namespace Yavsc.Controllers
ModelState.AddModelError ("Person", LocalizedText.No_calendar_for_this_user);
return View (model);
}
DateTime maxdate = model.MaxDate;
DateTime maxdate = model.EndDate;
CalendarApi c = new CalendarApi ();
CalendarEventList res;
try {