Skip to content
Permalink
Browse files

- FIXED: Autobreak in TCPDF

- FIXED: add-new-limit-bug in edit-parameter-template
- ADDED: placeholder-files in the folders "filesystem" and "logs"
for folder-structure generating the via Git
  • Loading branch information
open-lims committed Jul 9, 2013
1 parent b9da458 commit 551b5e42286b77745d9ab9dc66d9a4f2964d71f6
@@ -0,0 +1 @@
Placeholder-file for empty folders
@@ -0,0 +1 @@
Placeholder-file for empty folders
@@ -0,0 +1 @@
Placeholder-file for empty folders
@@ -0,0 +1 @@
Placeholder-file for empty folders
@@ -0,0 +1 @@
Placeholder-file for empty folders
@@ -0,0 +1 @@
Placeholder-file for empty folders
@@ -0,0 +1 @@
Placeholder-file for empty folders
@@ -0,0 +1 @@
Placeholder-file for empty folders
@@ -0,0 +1 @@
Placeholder-file for empty folders
@@ -0,0 +1 @@
Placeholder-file for empty folders
@@ -0,0 +1 @@
Placeholder-file for empty folders
@@ -0,0 +1 @@
Placeholder-file for empty folders
@@ -0,0 +1 @@
Placeholder-file for empty folders
@@ -753,6 +753,8 @@ public function edit($name, $field_array, $limit_array)
}
return false;
}
array_push($current_limit_array, $parameter_limit_id_array[$i]);
}
}
}
@@ -149,11 +149,26 @@ public function get_pdf()
foreach($this->content_array as $key => $value)
{
$height = $this->height;
foreach($value as $sub_key => $sub_value)
{
if (($width = $this->width_array[$sub_value['name']]) != null)
{
$string_height = $this->pdf->getStringHeight($width, $sub_value['content'], true, true, '', 1);
if ($string_height > $height)
{
$height = $string_height;
}
}
}
foreach($value as $sub_key => $sub_value)
{
if (($width = $this->width_array[$sub_value['name']]) != null)
{
$this->pdf->MultiCell($width, $this->height, $sub_value['content'], 1, 'L', 1, 0, '', '', true, 0, true, true, 0, "T");
$this->pdf->MultiCell($width, $height, $sub_value['content'], 1, 'L', 1, 0, '', '', true, 0, true, true, 0, "T");
}
}
@@ -35,6 +35,8 @@ class DataReportIO
*/
public static function get_data_item_report($sql, $item_id, $pdf)
{
global $regional;
if ($sql and is_object($pdf))
{
// Values
@@ -52,7 +54,7 @@ public static function get_data_item_report($sql, $item_id, $pdf)
$pdf->SetFont('dejavusans', 'B', 14, '', true);
$pdf->Write(0, 'Value - '.$value_object->get_name().'', '', 0, 'C', true, 0, false, false, 0);
$pdf->Write(0, '', '', 0, 'L', true, 0, false, false, 0);
$pdf->SetFont('dejavusans', '', 14, '', true);
$pdf->SetFont('dejavusans', '', 12, '', true);
if (is_array($value_object_value_array) and count($value_object_value_array) >= 1)
{
@@ -62,17 +64,32 @@ public static function get_data_item_report($sql, $item_id, $pdf)
if ($sub_value['type'] == "textarea")
{
$pdf->SetFont('dejavusans', 'B', 14, '', true);
$pdf->SetFont('dejavusans', 'B', 12, '', true);
$pdf->MultiCell(190, 9, $sub_value['title'], 1, 'L', 1, 1, '', '', true, 0, true, true, 0, "T");
$pdf->SetFont('dejavusans', '', 14, '', true);
$pdf->MultiCell(190, 40, $sub_value['content'][0], 1, 'L', 1, 1, '', '', true, 0, true, true, 0, "T");
$pdf->SetFont('dejavusans', '', 12, '', true);
$string_height = $pdf->getStringHeight(110, $sub_value['content'][0], true, true, '', 1);
$pdf->MultiCell(190, $string_height, $sub_value['content'][0], 1, 'L', 1, 1, '', '', true, 0, true, true, 0, "T");
}
else
{
$pdf->SetFont('dejavusans', 'B', 14, '', true);
$pdf->MultiCell(80, 9, $sub_value['title'], 1, 'L', 1, 0, '', '', true, 0, true, true, 0, "T");
$pdf->SetFont('dejavusans', '', 14, '', true);
$pdf->MultiCell(110, 9, $sub_value['content'][0], 1, 'L', 1, 1, '', '', false, 0, true, true, 0, "T");
$pdf->SetFont('dejavusans', 'B', 12, '', true);
$string_height1 = $pdf->getStringHeight(80, $sub_value['title'], true, true, '', 1);
$pdf->SetFont('dejavusans', '', 12, '', true);
$string_height2 = $pdf->getStringHeight(110, $sub_value['content'][0], true, true, '', 1);
if ($string_height1 > $string_height2)
{
$height = $string_height1;
}
else
{
$height = $string_height2;
}
$pdf->SetFont('dejavusans', 'B', 12, '', true);
$pdf->MultiCell(80, $height, $sub_value['title'], 1, 'L', 1, 0, '', '', true, 0, true, true, 0, "T");
$pdf->SetFont('dejavusans', '', 12, '', true);
$pdf->MultiCell(110, $height, $sub_value['content'][0], 1, 'L', 1, 1, '', '', true, 0, true, true, 0, "T");
}
}
}
@@ -89,7 +106,7 @@ public static function get_data_item_report($sql, $item_id, $pdf)
array("name" => "user", "title" => "User", "width" =>50)
);
$report_table = new ReportTable_IO($pdf);
$report_table = new ReportTable_IO($pdf, '', '12');
$report_table->add_header($header_array);
foreach($value_object_version_array as $sub_key => $sub_value)
@@ -133,7 +150,7 @@ public static function get_data_item_report($sql, $item_id, $pdf)
array("name" => "user", "title" => "User", "width" =>48)
);
$report_table = new ReportTable_IO($pdf, '17');
$report_table = new ReportTable_IO($pdf, '', '12');
$report_table->add_header($header_array);
foreach ($file_array as $key => $value)
@@ -82,6 +82,10 @@ DataParameter = function()
"" +
"<div id='DataParameterAdminTemplateLimitsDialogRename' title='Rename Limit'>" +
"Name: <input type='text' size='35' />" +
"</div>" +
"" +
"<div id='DataParameterAdminTemplateDialogMethods' title='Delete Template' style='display: none;'>" +
"Lorem Ipsum" +
"</div>");

$(".DataParameterTemplateFieldDeleteButton").each(function()
@@ -117,6 +121,14 @@ DataParameter = function()
});
});

$(".DataParameterTemplateFieldMethodButton").each(function()
{
$(this).click(function()
{
$("#DataParameterAdminTemplateDialogMethods").dialog("open");
});
});

init();
}

@@ -358,6 +370,25 @@ DataParameter = function()
// Admin
init = function()
{
// Method Dialog
$("#DataParameterAdminTemplateDialogMethods").dialog(
{
autoOpen: false,
buttons:
{
"Close": function()
{
$( this ).dialog( "close" );
},
"OK": function()
{
$( this ).dialog( "close" );
}
},
height: 140,
width: 400
});

// Limit Dialog
$("#DataParameterAdminTemplateLimitsDialog").dialog(
{
@@ -560,7 +591,7 @@ DataParameter = function()
"<td><input type='text' size='6' name='usl-"+line_counter+"' class='DataParameterAdminValue' /></td>" +
"<td><input type='text' size='6' name='min-"+line_counter+"' class='DataParameterAdminValue' /></td>" +
"<td><input type='text' size='6' name='max-"+line_counter+"' class='DataParameterAdminValue' /></td>" +
"<td>Methods</td>" +
"<td><button id='DataParameterTemplateFieldMethodButton"+line_counter+"'>Methods</button></td>" +
"<td><a title='delete' style='cursor: pointer;' id='DataParameterTemplateFieldDeleteButton"+line_counter+"'><img src='images/icons/delete.png' alt='D' /></a></td>" +
"</tr>");

@@ -594,6 +625,11 @@ DataParameter = function()
});
});

$("#DataParameterTemplateFieldMethodButton"+line_counter+"").click(function()
{
$("#DataParameterAdminTemplateDialogMethods").dialog("open");
});

base_form_init();
});

@@ -192,7 +192,7 @@
<td><input type='text' size='6' name='usl-1' class='DataParameterAdminValue' /></td>
<td><input type='text' size='6' name='min-1' class='DataParameterAdminValue' /></td>
<td><input type='text' size='6' name='max-1' class='DataParameterAdminValue' /></td>
<td>[[LANG:DataAdminParameterTemplateAddMethods]]</td>
<td><button id='DataParameterTemplateFieldMethodButton1' class='DataParameterTemplateFieldMethodButton'>[[LANG:DataAdminParameterTemplateAddMethods]]</button></td>
<td></td>
</tr>
</tbody>
@@ -103,6 +103,7 @@
});
});
});
/*]]>*/
</script>
@@ -179,7 +180,7 @@
<td><input type='text' size='6' name='usl-[[FIELDS:ID]]' class='DataParameterAdminValue' value='[[FIELDS:USL]]' /></td>
<td><input type='text' size='6' name='min-[[FIELDS:ID]]' class='DataParameterAdminValue' value='[[FIELDS:MIN]]' /></td>
<td><input type='text' size='6' name='max-[[FIELDS:ID]]' class='DataParameterAdminValue' value='[[FIELDS:MAX]]' /></td>
<td>[[LANG:DataAdminParameterTemplateEditMethods]]</td>
<td><button id='DataParameterTemplateFieldMethodButton[[FIELDS:ID]]' class='DataParameterTemplateFieldMethodButton'>[[LANG:DataAdminParameterTemplateEditMethods]]</button></td>
<td>
<!-- IF ([[FIELDS:DELETABLE]]) -->
<a title='delete' style='cursor: pointer;' id='DataParameterTemplateFieldDeleteButton[[FIELDS:ID]]' class='DataParameterTemplateFieldDeleteButton'><img src='images/icons/delete.png' alt='D' /></a>

0 comments on commit 551b5e4

Please sign in to comment.
You can’t perform that action at this time.