# HG changeset patch # User Michiel Broek # Date 1659353178 -7200 # Node ID 55c2510891b8c8269ab2af8e163b6f1e0556178e # Parent 3775ee26657f2065a27b76ea4bceb289c89527ba Removed the rest of the database editors, all is now better and completer in the new application. diff -r 3775ee26657f -r 55c2510891b8 www/Makefile --- a/www/Makefile Mon Aug 01 09:56:23 2022 +0200 +++ b/www/Makefile Mon Aug 01 13:26:18 2022 +0200 @@ -3,16 +3,11 @@ include ../Makefile.global -SRC = config.php.dist crontasks.php \ - export_equipments.php export_fermentables.php export_mashs.php \ - export_miscs.php export_styles.php export_waters.php \ - export_yeasts.php favicon.ico gen_about.php \ +SRC = config.php.dist crontasks.php favicon.ico gen_about.php \ getbrewlog.php getco2meter.php getco2pressurelog.php getfermentablesources.php \ getfermenter.php getfermentlog.php gethopsources.php getmiscsources.php getnode.php \ getwatersources.php getyeastsources.php getispindel.php getispindellog.php \ import_ingredients.php index.php \ - inv_equipments.php inv_fermentables.php \ - inv_miscs.php inv_waters.php inv_yeasts.php \ log_brew.php log_co2pressure.php log_fermentation.php log_ispindel.php \ mon_brewer.php mon_co2meter.php mon_fermenter.php mon_ispindel.php mon_node.php \ prod_archive_code.php prod_archive_date.php prod_archive_name.php prod_beerxml.php \ diff -r 3775ee26657f -r 55c2510891b8 www/export_equipments.php --- a/www/export_equipments.php Mon Aug 01 09:56:23 2022 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,133 +0,0 @@ - 0) ? xmlwriter_text($xw, 'TRUE') : xmlwriter_text($xw, 'FALSE'); - xmlwriter_end_element($xw); - - xmlwriter_start_element($xw, 'TOP_UP_KETTLE'); - xmlwriter_text($xw, sprintf("%.5f", floatval($row['top_up_kettle']))); - xmlwriter_end_element($xw); - - xmlwriter_start_element($xw, 'HOP_UTILIZATION'); - xmlwriter_text($xw, sprintf("%.5f", floatval($row['hop_utilization']))); - xmlwriter_end_element($xw); - - xmlwriter_start_element($xw, 'LAUTER_VOLUME'); - xmlwriter_text($xw, sprintf("%.5f", floatval($row['lauter_volume']))); - xmlwriter_end_element($xw); - - xmlwriter_start_element($xw, 'LAUTER_HEIGHT'); - xmlwriter_text($xw, sprintf("%.5f", floatval($row['lauter_height']))); - xmlwriter_end_element($xw); - - xmlwriter_start_element($xw, 'LAUTER_DEADSPACE'); - xmlwriter_text($xw, sprintf("%.5f", floatval($row['lauter_deadspace']))); - xmlwriter_end_element($xw); - - xmlwriter_start_element($xw, 'KETTLE_VOLUME'); - xmlwriter_text($xw, sprintf("%.5f", floatval($row['kettle_volume']))); - xmlwriter_end_element($xw); - - xmlwriter_start_element($xw, 'KETTLE_HEIGHT'); - xmlwriter_text($xw, sprintf("%.5f", floatval($row['kettle_height']))); - xmlwriter_end_element($xw); - - xmlwriter_start_element($xw, 'MASH_VOLUME'); - xmlwriter_text($xw, sprintf("%.5f", floatval($row['mash_volume']))); - xmlwriter_end_element($xw); - - xmlwriter_start_element($xw, 'EFFICIENCY'); - xmlwriter_text($xw, sprintf("%.5f", floatval($row['efficiency']))); - xmlwriter_end_element($xw); - - xmlwriter_end_element($xw); // EQUIPMENT -} -xmlwriter_end_element($xw); // EQUIPMENTS - -$beerxml = xmlwriter_output_memory($xw); - -Header('Content-type: text/xml'); -header('Content-Disposition: attachment; filename="equipments.xml"'); -header('Content-Transfer-Encoding: binary'); -header('Expires: 0'); -header('Pragma: no-cache'); -header('Content-Length: '.strlen($beerxml)); -exit($beerxml); diff -r 3775ee26657f -r 55c2510891b8 www/export_fermentables.php --- a/www/export_fermentables.php Mon Aug 01 09:56:23 2022 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,143 +0,0 @@ - 0) { - xmlwriter_start_element($xw, 'TIME'); - xmlwriter_text($xw, sprintf("%.3f",floatval($row['time']))); - xmlwriter_end_element($xw); - } - - if (floatval($row['cost']) > 0) { - xmlwriter_start_element($xw, 'COST'); - xmlwriter_text($xw, sprintf("%.5f",floatval($row['cost']))); - xmlwriter_end_element($xw); - } - - xmlwriter_start_element($xw, 'ALWAYS_ON_STOCK'); - ($row['always_on_stock']) ? xmlwriter_text($xw, 'TRUE') : xmlwriter_text($xw, 'FALSE'); - xmlwriter_end_element($xw); - - if (strlen($row['notes'])) { - xmlwriter_start_element($xw, 'NOTES'); - xmlwriter_text($xw, $row['notes']); - xmlwriter_end_element($xw); - } - - if (strlen($row['use_for'])) { - xmlwriter_start_element($xw, 'USE_FOR'); - xmlwriter_text($xw, $row['use_for']); - xmlwriter_end_element($xw); - } - - xmlwriter_end_element($xw); // MISC -} -xmlwriter_end_element($xw); // MISCS - -$beerxml = xmlwriter_output_memory($xw); - -Header('Content-type: text/xml'); -header('Content-Disposition: attachment; filename="miscs.xml"'); -header('Content-Transfer-Encoding: binary'); -header('Expires: 0'); -header('Pragma: no-cache'); -header('Content-Length: '.strlen($beerxml)); -exit($beerxml); diff -r 3775ee26657f -r 55c2510891b8 www/export_styles.php --- a/www/export_styles.php Mon Aug 01 09:56:23 2022 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,150 +0,0 @@ - 0) { - xmlwriter_start_element($xw, 'COST'); - xmlwriter_text($xw, sprintf("%.5f",floatval($row['cost']))); - xmlwriter_end_element($xw); - } - - if (strlen($row['notes'])) { - xmlwriter_start_element($xw, 'NOTES'); - xmlwriter_text($xw, $row['notes']); - xmlwriter_end_element($xw); - } - - xmlwriter_start_element($xw, 'CALCIUM'); - xmlwriter_text($xw, sprintf("%.4f",floatval($row['calcium']))); - xmlwriter_end_element($xw); - - xmlwriter_start_element($xw, 'BICARBONATE'); - xmlwriter_text($xw, sprintf("%.4f",floatval($row['bicarbonate']))); - xmlwriter_end_element($xw); - - xmlwriter_start_element($xw, 'SULFATE'); - xmlwriter_text($xw, sprintf("%.4f",floatval($row['sulfate']))); - xmlwriter_end_element($xw); - - xmlwriter_start_element($xw, 'CHLORIDE'); - xmlwriter_text($xw, sprintf("%.4f",floatval($row['chloride']))); - xmlwriter_end_element($xw); - - xmlwriter_start_element($xw, 'SODIUM'); - xmlwriter_text($xw, sprintf("%.4f",floatval($row['sodium']))); - xmlwriter_end_element($xw); - - xmlwriter_start_element($xw, 'MAGNESIUM'); - xmlwriter_text($xw, sprintf("%.4f",floatval($row['magnesium']))); - xmlwriter_end_element($xw); - - xmlwriter_start_element($xw, 'TOTAL_ALKALINITY'); - xmlwriter_text($xw, sprintf("%.4f",floatval($row['total_alkalinity']))); - xmlwriter_end_element($xw); - - xmlwriter_start_element($xw, 'PH'); - xmlwriter_text($xw, sprintf("%.5f",floatval($row['ph']))); - xmlwriter_end_element($xw); - - xmlwriter_end_element($xw); // WATER -} -xmlwriter_end_element($xw); // WATERS - -$beerxml = xmlwriter_output_memory($xw); - -Header('Content-type: text/xml'); -header('Content-Disposition: attachment; filename="waters.xml"'); -header('Content-Transfer-Encoding: binary'); -header('Expires: 0'); -header('Pragma: no-cache'); -header('Content-Length: '.strlen($beerxml)); -exit($beerxml); diff -r 3775ee26657f -r 55c2510891b8 www/export_yeasts.php --- a/www/export_yeasts.php Mon Aug 01 09:56:23 2022 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,74 +0,0 @@ - 0) - field($xw, 'COST', sprintf("%.5f",floatval($row['cost']))); - if (strlen($row['notes'])) - field($xw, 'NOTES', $row['notes']); - - xmlwriter_end_element($xw); // YEAST -} -xmlwriter_end_element($xw); // YEASTS - -$beerxml = xmlwriter_output_memory($xw); - -Header('Content-type: text/xml'); -header('Content-Disposition: attachment; filename="yeasts.xml"'); -header('Content-Transfer-Encoding: binary'); -header('Expires: 0'); -header('Pragma: no-cache'); -header('Content-Length: '.strlen($beerxml)); -exit($beerxml); diff -r 3775ee26657f -r 55c2510891b8 www/includes/global.inc.php --- a/www/includes/global.inc.php Mon Aug 01 09:56:23 2022 +0200 +++ b/www/includes/global.inc.php Mon Aug 01 13:26:18 2022 +0200 @@ -253,15 +253,6 @@
  • Import beerxml
    • -
  • Inventaris - -
  • Over