Skip to content

Commit 1052913

Browse files
author
Stephen
committed
config rework and cleanup
moved js to setup, reworked config arrays
1 parent 49da28d commit 1052913

File tree

4 files changed

+97
-92
lines changed

4 files changed

+97
-92
lines changed

‎hooks/all.php‎

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -16,80 +16,6 @@
1616
}
1717
}
1818

19-
function HookPdf_exportAllAdditionalheaderjs(){
20-
global $baseurl,$k,$baseurl_short,$css_reload_key;
21-
?>
22-
<link rel="stylesheet" type="text/css" media="screen,projection,print" href="<?php echo $baseurl_short?>plugins/pdf_export/js/chosen/chosen.min.css?css_reload_key=<?php echo $css_reload_key?>"/>
23-
24-
<script type="text/javascript" src="<?php echo $baseurl_short?>plugins/pdf_export/js/chosen/chosen.jquery.min.js?css_reload_key=<?php echo $css_reload_key?>"></script>
25-
<script type="text/javascript" src="<?php echo $baseurl_short?>plugins/pdf_export/js/chosen.order.jquery.min.js?css_reload_key=<?php echo $css_reload_key?>"></script>
26-
27-
28-
29-
<script type="text/javascript">
30-
31-
jQuery(document).ready(function () {
32-
if (jQuery('#pdfconfigwrapper').length) {
33-
jQuery("select#pdf_export_fields_include").chosen();
34-
35-
// Get a reference to the DOM element
36-
var myhiddenfield = jQuery('select[multiple]#pdf_export_fields_include').get(0);
37-
ChosenOrder.setSelectionOrder(myhiddenfield, jQuery('#pdf_export_fields_include_hidden').val().split(','), true);
38-
39-
var displayOrder = function() {
40-
//console.log("something changed");
41-
var myselection = ChosenOrder.getSelectionOrder(myhiddenfield);
42-
//console.log(myselection);
43-
jQuery('#pdf_export_fields_include_hidden').val("");
44-
jQuery(myselection).each(function(i) {
45-
jQuery('#pdf_export_fields_include_hidden').val( function( index, val ) {
46-
return val + "," + myselection[i];
47-
});
48-
});
49-
var trimmedval = jQuery('#pdf_export_fields_include_hidden').val();
50-
jQuery('#pdf_export_fields_include_hidden').val(trimmedval.substring(1));
51-
52-
53-
}
54-
55-
jQuery('#pdf_export_fields_include').change(function() {
56-
setTimeout(displayOrder, 0);
57-
58-
});
59-
60-
61-
62-
//prejson.push({name: 'configname', value: confignamevalue});
63-
64-
jQuery( "#jsonit" ).click(function( ) {
65-
var prejson = jQuery('#pdfconfigwrapper').find('input[name!="pdf_export_fields_include[]"][name!="pdf_export_rt_exclude[]"]').serializeArray();
66-
var titex = jQuery('#pdf_export_exclude_title').val();
67-
prejson.push({name:"pdf_export_exclude_title", value: titex});
68-
var confignamevalue = jQuery('#configname').val();
69-
var dataString = 'mydata=' + JSON.stringify(prejson) + '&configname='+ confignamevalue;
70-
71-
//console.log(prejson);
72-
jQuery.ajax({
73-
type: "POST",
74-
url: "<?php echo $baseurl_short?>plugins/pdf_export/pages/savejsonconfig.php",
75-
data: dataString,
76-
cache: false,
77-
success: function(result){
78-
jQuery('#configname').val("");
79-
alert("Your config was saved.");
80-
}});
81-
});
82-
83-
84-
jQuery('#pdf_export_fields_include_hidden').change(function() {
85-
ChosenOrder.setSelectionOrder(myhiddenfield, jQuery('#pdf_export_fields_include_hidden').val().split(','), true);
86-
});
87-
88-
}
89-
90-
});
91-
</script>
92-
<?php }
9319

9420

9521
?>

‎include/general.php‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,19 @@ public function MultiRow($left, $right) {
119119
$configarray="";
120120
}
121121
if ($configarray!="") {
122-
$ttfheaderfontvar = $configarray[0]['value'];
123-
$ttflistfontvar = $configarray[1]['value'];
124-
$logourlvar = $configarray[2]['value'];
125-
$logodeetsvar=$configarray[3]['value'];
126-
$imagesizeidvar = $configarray[4]['value'];
127-
$imageheightvar = $configarray[5]['value'];
128-
$exportfieldslistvar = $configarray[6]['value'];
129-
$excludetitlevar = $configarray[9]['value'];
122+
$configarray = array_combine(array_column($configarray, 'name'), array_column($configarray, 'value'));
123+
124+
$ttfheaderfontvar = $configarray['pdf_export_ttf_header_font_path'];
125+
$ttflistfontvar = $configarray['pdf_export_ttf_list_font_path'];
126+
$logourlvar = $configarray['pdf_export_logo_url'];
127+
$logodeetsvar=$configarray['pdf_export_logo_deets'];
128+
$imagesizeidvar = $configarray['pdf_export_imagesizeid'];
129+
$imageheightvar = $configarray['pdf_export_imgheight'];
130+
$exportfieldslistvar = $configarray['pdf_export_fields_include_hidden'];
131+
$excludetitlevar = $configarray['pdf_export_exclude_title'];
132+
$exportbarcodecvar = $configarray['pdf_export_barcode'];
133+
$barcodefieldvar = $configarray['pdf_export_barcode_field'];
134+
$barcodetypecvar = $configarray['pdf_export_barcode_type'];
130135
} else {
131136
$ttfheaderfontvar = $pdf_export_ttf_header_font_path;
132137
$ttflistfontvar = $pdf_export_ttf_list_font_path;
@@ -136,6 +141,9 @@ public function MultiRow($left, $right) {
136141
$imagesizeidvar = $pdf_export_imagesizeid;
137142
$exportfieldslistvar = $pdf_export_fields_include_hidden;
138143
$excludetitlevar = $pdf_export_exclude_title;
144+
$exportbarcodecvar = $pdf_export_barcode;
145+
$barcodefieldvar = $pdf_export_barcode_field;
146+
$barcodetypecvar = $pdf_export_barcode_type;
139147
}
140148

141149
// set document information
@@ -341,10 +349,10 @@ public function MultiRow($left, $right) {
341349
//if($notepages>1){$pdf->setPage($currentpdfpage+($notepages-1));}
342350
if (($whereabouts)&&($include =='w')) {
343351
$pdf->MultiRow($whereabouts[0]['title'],ltrim(trim($whereabouts[0]['value']),','));
344-
} elseif (($pdf_export_barcode==true) && ($pdf_export_barcode_field == $include) && (get_data_by_field($ref, $include))) {
352+
} elseif (($exportbarcodecvar==true) && ($barcodefieldvar == $include) && (get_data_by_field($ref, $include))) {
345353
$pdf->MultiRow(i18n_get_translated($fieldsf["title"]),'');
346354
$pdf->SetLineStyle($stylenoline);
347-
$pdf->MultiRow('',$pdf->write1DBarcode(trim(get_data_by_field($ref, $include)), $pdf_export_barcode_type, '1.8', $ypos,2,1, 0.4,$barcodestyle, 'N'));
355+
$pdf->MultiRow('',$pdf->write1DBarcode(trim(get_data_by_field($ref, $include)), $barcodetypecvar, '1.8', $ypos,2,1, 0.4,$barcodestyle, 'N'));
348356
$pdf->SetLineStyle($style);
349357
$pdf->SetY($ypos+1);
350358
//$pdf->write1DBarcode('1234567', $pdf_export_barcode_type, '', '',2,1, 0.4,$barcodestyle, '');

‎pages/pdf_export_config.php‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -229,15 +229,13 @@ function loadIt() {
229229
<input name="save" type="submit" value="&nbsp;&nbsp;<?php echo $lang["create"]?>&nbsp;&nbsp;" />
230230
</div>
231231
</form><?php
232-
//$thisrefarray = get_resource_field_data ($ref,false);
233-
//$fieldsf = get_field('73');
234-
//echo $fieldsf["title"];
235-
//echo get_data_by_field ($ref, '73');
236-
//$includearr=explode(",",$pdf_export_fields_include);
232+
//$selectedconfig="test.json";
233+
//$configfile = file_get_contents($_SERVER["DOCUMENT_ROOT"].'/filestore/pdf_export/jsonconfigs/'. $selectedconfig);
234+
//$configarray = json_decode($configfile, true);
235+
//$configarray = array_combine(array_column($configarray, 'name'), array_column($configarray, 'value'));
237236

238-
//echo $fdata["value"];
239237
//echo "<pre>";
240-
//print_r($includearr);
238+
//print_r($configarray);
241239
//echo "</pre>";
242240

243241
?>

‎pages/setup.php‎

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,80 @@ function do_alert($msg)
6565
}
6666

6767

68-
?><script type="text/javascript">
68+
?><link rel="stylesheet" type="text/css" media="screen,projection,print" href="<?php echo $baseurl_short?>plugins/pdf_export/js/chosen/chosen.min.css?css_reload_key=<?php echo $css_reload_key?>"/>
69+
70+
<script type="text/javascript" src="<?php echo $baseurl_short?>plugins/pdf_export/js/chosen/chosen.jquery.min.js?css_reload_key=<?php echo $css_reload_key?>"></script>
71+
<script type="text/javascript" src="<?php echo $baseurl_short?>plugins/pdf_export/js/chosen.order.jquery.min.js?css_reload_key=<?php echo $css_reload_key?>"></script>
72+
73+
74+
75+
<script type="text/javascript">
76+
77+
jQuery(document).ready(function () {
78+
if (jQuery('#pdfconfigwrapper').length) {
79+
jQuery("select#pdf_export_fields_include").chosen();
80+
81+
// Get a reference to the DOM element
82+
var myhiddenfield = jQuery('select[multiple]#pdf_export_fields_include').get(0);
83+
ChosenOrder.setSelectionOrder(myhiddenfield, jQuery('#pdf_export_fields_include_hidden').val().split(','), true);
84+
85+
var displayOrder = function() {
86+
//console.log("something changed");
87+
var myselection = ChosenOrder.getSelectionOrder(myhiddenfield);
88+
//console.log(myselection);
89+
jQuery('#pdf_export_fields_include_hidden').val("");
90+
jQuery(myselection).each(function(i) {
91+
jQuery('#pdf_export_fields_include_hidden').val( function( index, val ) {
92+
return val + "," + myselection[i];
93+
});
94+
});
95+
var trimmedval = jQuery('#pdf_export_fields_include_hidden').val();
96+
jQuery('#pdf_export_fields_include_hidden').val(trimmedval.substring(1));
97+
98+
99+
}
100+
101+
jQuery('#pdf_export_fields_include').change(function() {
102+
setTimeout(displayOrder, 0);
103+
104+
});
105+
106+
107+
108+
//prejson.push({name: 'configname', value: confignamevalue});
109+
110+
jQuery( "#jsonit" ).click(function( ) {
111+
var prejson = jQuery('#pdfconfigwrapper').find('input[name!="pdf_export_fields_include[]"][name!="pdf_export_rt_exclude[]"]').serializeArray();
112+
var titex = jQuery('#pdf_export_exclude_title').val();
113+
prejson.push({name:"pdf_export_exclude_title", value: titex});
114+
var bctrue = jQuery('#pdf_export_barcode').val();
115+
prejson.push({name:"pdf_export_barcode", value: bctrue});
116+
var bctype = jQuery('#pdf_export_barcode_type').val();
117+
prejson.push({name:"pdf_export_barcode_type", value: bctype});
118+
var confignamevalue = jQuery('#configname').val();
119+
var dataString = 'mydata=' + JSON.stringify(prejson) + '&configname='+ confignamevalue;
120+
121+
//console.log(prejson);
122+
jQuery.ajax({
123+
type: "POST",
124+
url: "<?php echo $baseurl_short?>plugins/pdf_export/pages/savejsonconfig.php",
125+
data: dataString,
126+
cache: false,
127+
success: function(result){
128+
jQuery('#configname').val("");
129+
alert("Your config was saved.");
130+
}});
131+
});
132+
133+
134+
jQuery('#pdf_export_fields_include_hidden').change(function() {
135+
ChosenOrder.setSelectionOrder(myhiddenfield, jQuery('#pdf_export_fields_include_hidden').val().split(','), true);
136+
});
137+
138+
}
139+
140+
});
141+
</script><script type="text/javascript">
69142
jQuery(document).ready(function () {
70143
toggleFields(); //call this first so we start out with the correct visibility depending on the selected form values
71144
//this will call our toggleFields function every time the selection value of our underAge field changes

0 commit comments

Comments
 (0)