diff --git a/kfet/static/kfet/js/kfet.api.js b/kfet/static/kfet/js/kfet.api.js index 20f1203f..d94a8b5b 100644 --- a/kfet/static/kfet/js/kfet.api.js +++ b/kfet/static/kfet/js/kfet.api.js @@ -620,7 +620,7 @@ class Day extends ModelObject { //Parse date and round it get date() { return this._date; } - set date(v) { this._date = dateUTCToParis(v).startof('date'); } + set date(v) { this._date = dateUTCToParis(v).startOf('date'); } } @@ -722,7 +722,10 @@ class Operation extends ModelObject { static get verbose_name() { return 'operation'; } formatter() { - return OperationFormatter; + if (this.type === 'purchase') + return PurchaseFormatter; + else + return SpecialOpeFormatter; } get amount() { return this._amount; } @@ -961,16 +964,15 @@ class ArticleList extends APIModelList { /** * Default structure for ArticleList instances - * @abstract * @default [Article, ArticleCategory] + * @see {@link Models.ModelList.models|ModelList.models} */ static get models() { return [Article, ArticleCategory]; } /** - * Default url to get ArticlList data - * @abstract + * Default url to get ArticleList data * @default django-js-reverse('kfet.kpsul.articles_data') * @see {@link Models.APIModelList.url_model|APIModelList.url_model} */ @@ -979,6 +981,30 @@ class ArticleList extends APIModelList { } } +/** + * OperationList model. Can be accessed through API. + * @extends Models.APIModelList + * @memberof Models + */ +class OperationList extends APIModelList { + /** + * Default structure for OperationList instances. + * @default [Operation, OperationGroup, Day] + * @see {@link Models.ModelList.models|ModelList.models} + */ + static get models() { + return [Operation, OperationGroup, Day]; + } + + /** + * Default url to get OperationList data. + * @default django-js-reverse('kfet.history.json') + * @see {@link Models.APIModelList.url_model|APIModelList.url_model} + */ + static get url_model() { + return Urls['kfet.history.json'](); + } +} /* ---------- ---------- */ @@ -1293,7 +1319,10 @@ class OpegroupFormatter extends Formatter { } static prop_valid_by(a) { - return 'Par '+a.valid_by; + if (a.valid_by) + return 'Par '+a.valid_by; + else + return ''; } }