Skip to content

Commit 83c0130

Browse files
sgade-reisyssgade-reisys
authored
Merge pull request #2772 from NYCComptroller/feature/release_5.3.2
NYCCHKBK-16148: Release 5.3.2
2 parents 10f1384 + 84ab8b3 commit 83c0130

30 files changed

Lines changed: 240 additions & 77 deletions

File tree

‎source/web/modules/custom/custom/checkbook_advanced_search/checkbook_advanced_search.libraries.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
search-iframe-alerts:
2-
version: 1.0.0
2+
version: 1.0.1
33
js:
44
js/advanced-search-checkbook-alert.js: { }
55
dependencies:
@@ -24,7 +24,7 @@ search-iframe-budget:
2424
- core/jquery.dialog.ajax
2525
- checkbook_advanced_search/search-iframe-common
2626
search-iframe-spending:
27-
version: 1.0.2
27+
version: 1.0.3
2828
js:
2929
js/advanced-search-spending.js: { }
3030
dependencies:
@@ -33,7 +33,7 @@ search-iframe-spending:
3333
- core/jquery.dialog.ajax
3434
- checkbook_advanced_search/search-iframe-common
3535
search-iframe-contracts:
36-
version: 1.0.3
36+
version: 1.0.4
3737
js:
3838
js/advanced-search-contracts.js: { }
3939
dependencies:
@@ -42,7 +42,7 @@ search-iframe-contracts:
4242
- core/jquery.dialog.ajax
4343
- checkbook_advanced_search/search-iframe-common
4444
search-iframe-payroll:
45-
version: 1.0.0
45+
version: 1.0.1
4646
js:
4747
js/advanced-search-payroll.js: { }
4848
dependencies:
@@ -51,7 +51,7 @@ search-iframe-payroll:
5151
- core/jquery.dialog.ajax
5252
- checkbook_advanced_search/search-iframe-common
5353
search-iframe-revenue:
54-
version: 1.0.3
54+
version: 1.0.4
5555
js:
5656
js/advanced-search-revenue.js: { }
5757
dependencies:

‎source/web/modules/custom/custom/checkbook_advanced_search/js/advanced-search-checkbook-alert.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,9 @@
278278
height: 80,
279279
autoResize: true,
280280
resizable: false,
281-
dialogClass: 'noTitleDialog dialog-schedule-confirm',
281+
open: function () {
282+
$(this).closest('.ui-dialog').addClass('noTitleDialog');
283+
},
282284
close: function () {
283285
var dialog = $("#dialog_schedule_confirm");
284286
$(dialog).replaceWith('<div id="dialog_schedule_confirm" style="display:none"></div>');

‎source/web/modules/custom/custom/checkbook_advanced_search/js/advanced-search-contracts.js‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -253,18 +253,24 @@
253253

254254
div.ele('vendor_name').autocomplete({
255255
source: $.fn.autoCompleteSourceUrl(solr_datasource,'vendor_name', nycha_filters),
256+
delay: 500,
257+
minLength: 3,
256258
select: function (event, ui) {
257259
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
258260
}
259261
});
260262
div.ele('contract_id').autocomplete({
261263
source: $.fn.autoCompleteSourceUrl(solr_datasource,'contract_number', nycha_filters),
264+
delay: 500,
265+
minLength: 3,
262266
select: function (event, ui) {
263267
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
264268
}
265269
});
266270
div.ele('pin').autocomplete({
267271
source:$.fn.autoCompleteSourceUrl(solr_datasource,'pin', nycha_filters),
272+
delay: 500,
273+
minLength: 3,
268274
select: function (event, ui) {
269275
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
270276
}
@@ -304,42 +310,56 @@
304310

305311
div.ele('vendor_name').autocomplete({
306312
source: $.fn.autoCompleteSourceUrl(solr_datasource,'vendor_name',filters),
313+
delay: 500,
314+
minLength: 3,
307315
select: function (event, ui) {
308316
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
309317
}
310318
});
311319
div.ele('contract_id').autocomplete({
312320
source: $.fn.autoCompleteSourceUrl(solr_datasource,'contract_number', filters),
321+
delay: 500,
322+
minLength: 3,
313323
select: function (event, ui) {
314324
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
315325
}
316326
});
317327
div.ele('apt_pin').autocomplete({
318328
source: $.fn.autoCompleteSourceUrl(solr_datasource,'apt_pin',filters),
329+
delay: 500,
330+
minLength: 3,
319331
select: function (event, ui) {
320332
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
321333
}
322334
});
323335
div.ele('pin').autocomplete({
324336
source: $.fn.autoCompleteSourceUrl(solr_datasource,'pin',filters),
337+
delay: 500,
338+
minLength: 3,
325339
select: function (event, ui) {
326340
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
327341
}
328342
});
329343
div.ele('entity_contract_number').autocomplete({
330344
source: $.fn.autoCompleteSourceUrl(solr_datasource,'contract_entity_contract_number',filters),
345+
delay: 500,
346+
minLength: 3,
331347
select: function (event, ui) {
332348
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
333349
}
334350
});
335351
div.ele('commodity_line').autocomplete({
336352
source: $.fn.autoCompleteSourceUrl(solr_datasource,'contract_commodity_line',filters),
353+
delay: 500,
354+
minLength: 3,
337355
select: function (event, ui) {
338356
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
339357
}
340358
});
341359
div.ele('budget_name').autocomplete({
342360
source:$.fn.autoCompleteSourceUrl(solr_datasource,'contract_budget_name',filters),
361+
delay: 500,
362+
minLength: 3,
343363
select: function (event, ui) {
344364
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
345365
}

‎source/web/modules/custom/custom/checkbook_advanced_search/js/advanced-search-payroll.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,10 @@
7777
pay_frequency: pay_frequency
7878
};
7979

80-
$("input[name='payroll_employee_name']").autocomplete({source: $.fn.autoCompleteSourceUrl(solr_datasource,'civil_service_title',filters)});
80+
$("input[name='payroll_employee_name']").autocomplete({
81+
source: $.fn.autoCompleteSourceUrl(solr_datasource,'civil_service_title',filters),
82+
delay: 500,
83+
minLength: 3});
8184
}
8285
//display form depending on domain filter radiobox
8386
let dataSource = $('input:radio[name=payroll_advanced_search_domain_filter]:checked').val() ? $('input:radio[name=payroll_advanced_search_domain_filter]:checked').val() : "checkbook";

‎source/web/modules/custom/custom/checkbook_advanced_search/js/advanced-search-revenue.js‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,8 +204,14 @@
204204
funding_class_code: funding_class_code,
205205
event_id: conditional_category_id
206206
};
207-
div.ele('revenue_class').autocomplete({source: $.fn.autoCompleteSourceUrl(solr_datasource, 'revenue_class_name', filters)});
208-
div.ele('revenue_source').autocomplete({source: $.fn.autoCompleteSourceUrl(solr_datasource, 'revenue_source_name', filters)});
207+
div.ele('revenue_class').autocomplete({
208+
source: $.fn.autoCompleteSourceUrl(solr_datasource, 'revenue_class_name', filters),
209+
delay: 500,
210+
minLength: 3});
211+
div.ele('revenue_source').autocomplete({
212+
source: $.fn.autoCompleteSourceUrl(solr_datasource, 'revenue_source_name', filters),
213+
delay: 500,
214+
minLength: 3});
209215
} else if (data_source === 'checkbook_nycha') {
210216
solr_datasource = 'nycha';
211217
let fiscal_year_id = parseInt((div.ele('budget_fy').val()) ? div.ele('budget_fy').val() : 0);
@@ -226,8 +232,14 @@
226232
budget_type: budget_type,
227233
budget_name: budget_name
228234
};
229-
div.ele('revenue_class').autocomplete({source: $.fn.autoCompleteSourceUrl(solr_datasource, 'revenue_class', filters)});
230-
div.ele('nycha_revenue_category').autocomplete({source: $.fn.autoCompleteSourceUrl(solr_datasource, 'revenue_category', filters)});
235+
div.ele('revenue_class').autocomplete({
236+
source: $.fn.autoCompleteSourceUrl(solr_datasource, 'revenue_class', filters),
237+
delay: 500,
238+
minLength: 3});
239+
div.ele('nycha_revenue_category').autocomplete({
240+
source: $.fn.autoCompleteSourceUrl(solr_datasource, 'revenue_category', filters),
241+
delay: 500,
242+
minLength: 3});
231243
}
232244

233245
$('.ui-autocomplete-input').bind('autocompleteselect', function (event, ui) {

‎source/web/modules/custom/custom/checkbook_advanced_search/js/advanced-search-spending.js‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -488,55 +488,73 @@
488488

489489
div.ele('payee_name').autocomplete({
490490
source: $.fn.autoCompleteSourceUrl(solr_datasource, 'vendor_name', filters),
491+
delay: 500,
492+
minLength: 3,
491493
select: function (event, ui) {
492494
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
493495
}
494496
});
495497
div.ele('contract_id').autocomplete({
496498
source: $.fn.autoCompleteSourceUrl(solr_datasource, 'contract_number', filters),
499+
delay: 500,
500+
minLength: 3,
497501
select: function (event, ui) {
498502
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
499503
}
500504
});
501505
div.ele('capital_project').autocomplete({
502506
source: $.fn.autoCompleteSourceUrl(solr_datasource, 'reporting_code', filters),
507+
delay: 500,
508+
minLength: 3,
503509
select: function (event, ui) {
504510
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
505511
}
506512
});
507513
div.ele('document_id').autocomplete({
508514
source: $.fn.autoCompleteSourceUrl(solr_datasource, 'expense_id', filters),
515+
delay: 500,
516+
minLength: 3,
509517
select: function (event, ui) {
510518
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
511519
}
512520
});
513521
div.ele('commodity_line').autocomplete({
514522
source: $.fn.autoCompleteSourceUrl(solr_datasource, 'spending_commodity_line', filters),
523+
delay: 500,
524+
minLength: 3,
515525
select: function (event, ui) {
516526
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
517527
}
518528
});
519529
div.ele('budget_name').autocomplete({
520530
source:$.fn.autoCompleteSourceUrl(solr_datasource, 'spending_budget_name', filters),
531+
delay: 500,
532+
minLength: 3,
521533
select: function (event, ui) {
522534
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
523535
}
524536
});
525537
div.ele('entity_contract_number').autocomplete({
526538
source: $.fn.autoCompleteSourceUrl(solr_datasource, 'spending_entity_contract_number', filters),
539+
delay: 500,
540+
minLength: 3,
527541
select: function (event, ui) {
528542
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
529543
}
530544
});
531545
div.ele('vendor_name').autocomplete({
532546
source: $.fn.autoCompleteSourceUrl(solr_datasource, 'vendor_name', filters),
547+
delay: 500,
548+
minLength: 3,
533549
select: function (event, ui) {
534550
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
535551
}
536552
});
537553
//@ToDo: check which one correct below or line 510 above
538554
div.ele('document_id').autocomplete({
539555
source: $.fn.autoCompleteSourceUrl(solr_datasource, 'document_id', filters),
556+
delay: 500,
557+
minLength: 3,
540558
select: function (event, ui) {
541559
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
542560
}

‎source/web/modules/custom/custom/checkbook_alerts/src/checkbook_alerts.inc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ $sql=
5050
function _checkbook_alerts_transactions(){
5151
//Give default or option to pass this
5252
if(!isset($_GET['alert_theme_file'])){
53-
$_GET['alert_theme_file']='checkbook_alerts_subscribe_theme';
53+
$_GET['alert_theme_file']='checkbook_alerts_subscribe_theme';
5454
}
5555
if(!isset($_GET['alert_minimum_results'])){
5656
$_GET['alert_minimum_results']=1;

‎source/web/modules/custom/custom/checkbook_datafeeds/js/budget.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,8 @@
242242
};
243243
$('#edit-budget-code').autocomplete({
244244
source: $.fn.autoCompleteSourceUrl('citywide','budget_code_name_code',filters),
245+
delay: 500,
246+
minLength: 3,
245247
select: function (event, ui) {
246248
$.fn.preventSelectionDefault(event, ui, "No Matches Found");
247249
}
@@ -262,7 +264,10 @@
262264
fiscal_year: year,
263265
event_id:event
264266
};
265-
$('#edit-budget-code').autocomplete({source: $.fn.autoCompleteSourceUrl('citywide','budget_code_name_code',filters)});
267+
$('#edit-budget-code').autocomplete({
268+
source: $.fn.autoCompleteSourceUrl('citywide','budget_code_name_code',filters),
269+
delay: 500,
270+
minLength: 3});
266271
});
267272
});
268273

0 commit comments

Comments
 (0)