Konfiguration/Erfassen von Griffstück/Visier/Ausrüstung

res/layout/rbs_riser_config.xml

@@ -95,7 +95,7 @@
                             android:layout_weight="1"
                             android:ems="10"
                             android:gravity="center_vertical"
-                            android:inputType="numberDecimal"
+                            android:inputType="text"
                             android:paddingBottom="9dp"
                             android:paddingTop="9dp"
                             android:textSize="18sp"
@@ -128,11 +128,12 @@
                             android:layout_weight="2"
                             android:ems="10"
                             android:gravity="center_vertical"
-                            android:inputType="numberDecimal"
+                            android:inputType="text"
                             android:paddingBottom="9dp"
                             android:paddingTop="9dp"
                             android:textSize="18sp"
                             app:txtFont="@string/TitilliumWeb_Regular" />
+
                     </TableRow>
 
                     <TableRow

src/ch/spherIC/recurvebowsight/configuration/RiserConfigurationActivity.java

@@ -30,6 +30,7 @@ import ch.spherIC.recurvebowsight.components.FontArrayAdapter;
 import ch.spherIC.recurvebowsight.components.RiserSpinner;
 import ch.spherIC.recurvebowsight.database.dao.RiserDao;
 import ch.spherIC.recurvebowsight.model.IRiser;
+import ch.spherIC.recurvebowsight.model.Riser;
 import ch.spherIC.recurvebowsight.utilities.CompatibilityUtil;
 
 import java.text.DecimalFormat;
@@ -70,7 +71,10 @@ public class RiserConfigurationActivity extends Activity {
         initializeComponents();
         addRiserSpinnerListener();
         addButtonListeners();
+        loadRiserSpinner();
+    }
 
+    private void loadRiserSpinner() {
         List<IRiser> risers = RiserDao.getInstance().loadAll();
         this.rcRiserSpinner.setAdapter(new FontArrayAdapter<IRiser>(this, R.layout.rbs_spinner, risers, this.rcRiserSpinner));
     }
@@ -141,6 +145,7 @@ public class RiserConfigurationActivity extends Activity {
         if (this.selectedRiser != null) {
             try {
                 RiserDao.getInstance().delete(this.selectedRiser);
+                loadRiserSpinner();
             } catch (SQLiteConstraintException e) {
                 Toast toast = Toast.makeText(this, getResources().getString(R.string.caption_Cfg_DeleteNotPossible), Toast.LENGTH_LONG);
                 toast.setGravity(Gravity.CENTER, 0, 0);
@@ -152,6 +157,7 @@ public class RiserConfigurationActivity extends Activity {
     /**
      * Speichern.
      */
+    @SuppressWarnings("unchecked")
     protected void onSaveRiser() {
         if (this.selectedRiser != null) {
             if (!this.rcManufacturerTxtFld.getText().toString().isEmpty() && !this.rcModelTxtFld.getText().toString().isEmpty()
@@ -166,7 +172,9 @@ public class RiserConfigurationActivity extends Activity {
                 if (this.selectedRiser.getId() > 0) {
                     RiserDao.getInstance().update(this.selectedRiser);
                 } else {
-                    RiserDao.getInstance().insert(this.selectedRiser);
+                    this.selectedRiser = RiserDao.getInstance().insert(this.selectedRiser);
+                    loadRiserSpinner();
+                    this.rcRiserSpinner.setSelectedRiser(this.selectedRiser);
                 }
             } else {
                 Toast toast = Toast.makeText(this, getResources().getString(R.string.caption_Cfg_FillAllMandatoryFields), Toast.LENGTH_LONG);
@@ -179,9 +187,17 @@ public class RiserConfigurationActivity extends Activity {
     /**
      * Einfügen.
      */
+    @SuppressWarnings("unchecked")
     protected void onNewRiser() {
-        // TODO Auto-generated method stub
-
+        IRiser newRiser = new Riser(0, "*", "*", 0d, 0d, 0d);
+        this.selectedRiser = newRiser;
+        ((FontArrayAdapter<IRiser>) this.rcRiserSpinner.getAdapter()).add(newRiser);
+        this.rcRiserSpinner.setSelectedRiser(newRiser);
+        this.rcManufacturerTxtFld.setText("");
+        this.rcModelTxtFld.setText("");
+        this.rcSizeTxtFld.setText("");
+        this.rcVvisHTxtFld.setText("");
+        this.rcVvisVTxtFld.setText("");
     }
 
     @Override

src/ch/spherIC/recurvebowsight/database/dao/DAO.java

@@ -71,7 +71,7 @@ public abstract class DAO<E extends IEntity> {
      */
     public List<E> loadAll() {
         List<E> entities = new ArrayList<E>();
-        Cursor cursor = getDb().query(getTableName(), null, null, null, null, null, null);
+        Cursor cursor = getDb().query(getTableName(), null, null, null, null, null, getOrderBy());
         cursor.moveToFirst();
 
         while (!cursor.isAfterLast()) {
@@ -119,4 +119,7 @@ public abstract class DAO<E extends IEntity> {
         getDb().delete(getTableName(), getIdColumn() + " = " + entity.getId(), null);
     }
 
+    protected String getOrderBy() {
+        return null;
+    }
 }

src/ch/spherIC/recurvebowsight/database/dao/RiserDao.java

@@ -65,4 +65,8 @@ public final class RiserDao extends DAO<IRiser> {
         return TblRBSRiser.COL_ID;
     }
 
+    @Override
+    protected String getOrderBy() {
+        return TblRBSRiser.COL_MANUFACTURER + " asc, " + TblRBSRiser.COL_MODEL + " asc, " + TblRBSRiser.COL_SIZE + " asc";
+    }
 }