Merge remote-tracking branch 'origin/master'
# Conflicts: # src/Order.java
This commit is contained in:
commit
deeabfd2ad
@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="RunConfigurationProducerService">
|
|
||||||
<option name="ignoredProducers">
|
|
||||||
<set>
|
|
||||||
<option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
|
|
||||||
</set>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
@ -55,110 +55,4 @@ public class GeneralMethods {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// /**The method writeData saves the given data to a certain file.
|
|
||||||
// *
|
|
||||||
// * @param pathWrite the given filepath to write
|
|
||||||
// * @param data the data to be saved
|
|
||||||
// */
|
|
||||||
// public static void writeData(String pathWrite, ArrayList<String> data){
|
|
||||||
// try{
|
|
||||||
// BufferedWriter writer = new BufferedWriter(new FileWriter(pathWrite));
|
|
||||||
// for (String d : data) {
|
|
||||||
// writer.write(d);
|
|
||||||
// writer.newLine();
|
|
||||||
// }
|
|
||||||
// writer.close();
|
|
||||||
// } catch (IOException e) {
|
|
||||||
// e.printStackTrace();
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// /**
|
|
||||||
// * Author: Sabine Gubitz
|
|
||||||
// *ddd
|
|
||||||
// * The method read Data interprets a file and returns an useable list for other methods.
|
|
||||||
// * Files to be read have to use : as a divider between attributes
|
|
||||||
// *
|
|
||||||
// * @param pathRead determines the filename of the file that will be read
|
|
||||||
// * @return menueList, userList, orderList depending on Data read
|
|
||||||
// */
|
|
||||||
// public static ArrayList<String> readData(String pathRead) {
|
|
||||||
// Path path = Paths.get(pathRead);
|
|
||||||
//
|
|
||||||
// try {
|
|
||||||
// List<String> rows = Files.readAllLines(path);
|
|
||||||
//
|
|
||||||
// if (pathRead.equals("menue.txt")) {
|
|
||||||
// ArrayList<String> menueList = new ArrayList<>();
|
|
||||||
//
|
|
||||||
// for (String row : rows) {
|
|
||||||
// String[] parts = row.split(":");
|
|
||||||
//
|
|
||||||
// String day = parts[0];
|
|
||||||
// String date = parts[1];
|
|
||||||
// String meat = parts[2];
|
|
||||||
// String vegi = parts[3];
|
|
||||||
// String vegan = parts[4];
|
|
||||||
// String desert1 = parts[5];
|
|
||||||
// String desert2 = parts[6];
|
|
||||||
// menueList.add(day + "," + date + "," + meat + "," + vegi + "," + vegan + "," + desert1 + "," + desert2);
|
|
||||||
// }
|
|
||||||
// return menueList;
|
|
||||||
//
|
|
||||||
// } else if (pathRead.equals("users.txt")){
|
|
||||||
// ArrayList<String> userList = new ArrayList<>();
|
|
||||||
//
|
|
||||||
// for (String row : rows) {
|
|
||||||
// String[] parts = row.split(":");
|
|
||||||
//
|
|
||||||
// String nameParent1 = parts[0];
|
|
||||||
// String nameParent2 = parts[1];
|
|
||||||
// String billAddress = parts[2];
|
|
||||||
// String phonenumber = parts[3];
|
|
||||||
// String nameChildren = parts[4];
|
|
||||||
// String password = parts[5];
|
|
||||||
// }
|
|
||||||
// return userList;
|
|
||||||
//
|
|
||||||
// } else if (pathRead.equals("orders.txt")) {
|
|
||||||
// ArrayList<String> orderList = new ArrayList<>();
|
|
||||||
//
|
|
||||||
// for (String row : rows) {
|
|
||||||
// String[] parts = row.split(":");
|
|
||||||
//
|
|
||||||
// String date = parts[0];
|
|
||||||
// String meat = parts[1];
|
|
||||||
// String meatCount = parts[2];
|
|
||||||
// String vegi = parts[3];
|
|
||||||
// String vegiCount = parts[4];
|
|
||||||
// String vegan = parts[5];
|
|
||||||
// String veganCount = parts[6];
|
|
||||||
// String desert1 = parts[7];
|
|
||||||
// String desert1Count = parts[8];
|
|
||||||
// String desert2 = parts[9];
|
|
||||||
// String desert2Count = parts[10];
|
|
||||||
// }
|
|
||||||
// return orderList;
|
|
||||||
//
|
|
||||||
// }
|
|
||||||
// } catch (IOException e) {
|
|
||||||
// e.printStackTrace();
|
|
||||||
// }
|
|
||||||
// return null;
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
//
|
|
||||||
// /**
|
|
||||||
// * The method writeData2 writes the data of a List into a txt file.
|
|
||||||
// * @param pathWrite determines the filename of the file that will be written
|
|
||||||
// * @param listToWrite determines which ArrayList is to be used for writing the file
|
|
||||||
// */
|
|
||||||
// public void writeData2 (String pathWrite, ArrayList<String> listToWrite){
|
|
||||||
// if (pathWrite.equals("users.txt")) {
|
|
||||||
//
|
|
||||||
// } else if (pathWrite.equals("orders.txt")) {
|
|
||||||
//
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@ -1,3 +1,5 @@
|
|||||||
|
import java.util.ArrayList;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The class Order is an object class that holds the constructor for order objects.
|
* The class Order is an object class that holds the constructor for order objects.
|
||||||
*
|
*
|
||||||
@ -24,13 +26,22 @@ public class Order {
|
|||||||
return date+";"+user+";"+mealtype+";"+desserttype;
|
return date+";"+user+";"+mealtype+";"+desserttype;
|
||||||
}
|
}
|
||||||
|
|
||||||
// @Override
|
/**
|
||||||
// public String toString() {
|
* The Method create PDF is used to create a PDF document of the daily orders as well as the bills for each user
|
||||||
// return "Order{" +
|
*
|
||||||
// "date='" + date + '\'' +
|
* This Method uses PDF Clown, the source code can be found at http://www.pdfclown.org
|
||||||
// ", user='" + user + '\'' +
|
* PDF Clown is covered by LGPL, a copy of the LGPL can be found withing the documentation
|
||||||
// ", mealtyp='" + mealtyp + '\'' +
|
*
|
||||||
// ", deserttyp='" + deserttyp + '\'' +
|
* @param pathWrite determines which document should be created
|
||||||
// '}';
|
* @param listToWrite determines the list which is to be used to create the document
|
||||||
// }
|
* @author Sabine Gubitz
|
||||||
|
*/
|
||||||
|
|
||||||
|
public void createPDF (String pathWrite, ArrayList<String> listToWrite) {
|
||||||
|
if (pathWrite.equals("users.pdf")) {
|
||||||
|
|
||||||
|
} else if (pathWrite.equals("bills.pdf")) {
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user