diff --git a/pom.xml b/pom.xml
index 09972ac..a989ec6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
de.tilman
next-transactions
- 1.8
+ 1.9
org.springframework.boot
diff --git a/src/main/java/de/tilman/transactions/SecurityConfiguration.java b/src/main/java/de/tilman/transactions/SecurityConfiguration.java
index ee43702..3d3db16 100644
--- a/src/main/java/de/tilman/transactions/SecurityConfiguration.java
+++ b/src/main/java/de/tilman/transactions/SecurityConfiguration.java
@@ -21,12 +21,12 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
@Override
protected void configure(AuthenticationManagerBuilder auth) throws Exception {
auth.inMemoryAuthentication()
- .withUser("adam").password("test").roles("USER", "ADMIN").and()
- .withUser("betty").password("test").roles("USER");
+// .withUser("adam").password("test").roles("USER", "ADMIN").and()
+// .withUser("betty").password("test").roles("USER");
// SET PASSWORDS FOR PRODUCTION
-// .withUser("tilman").password(XXX).roles("USER", "ADMIN").and()
-// .withUser("anica").password(XXX).roles("USER");
+ .withUser("tilman").password(XXX).roles("USER", "ADMIN").and()
+ .withUser("anica").password(XXX).roles("USER");
}
@Override
diff --git a/src/main/resources/static/app/controllers.js b/src/main/resources/static/app/controllers.js
index 143e3c6..0941c8f 100644
--- a/src/main/resources/static/app/controllers.js
+++ b/src/main/resources/static/app/controllers.js
@@ -561,12 +561,21 @@ transactionControllers.controller('ImportListCtrl', [ '$scope', '$resource', '$l
line.submittedTransactionId = transaction.id;
// delete from CSV
- var descriptionPos = $scope.csvInput.search(line[3]);
+ console.log(line);
+ console.log(line[3]);
+ console.log($scope.csvInput);
+ var descriptionPos = $scope.csvInput.indexOf(line[3]);
var lineStart = $scope.csvInput.lastIndexOf('\n', descriptionPos);
var lineEnd = $scope.csvInput.indexOf('\n', descriptionPos);
if (lineEnd < 0)
lineEnd = $scope.csvInput.length;
- $scope.csvInput = $scope.csvInput.substring(0, lineStart) + $scope.csvInput.substring(lineEnd, $scope.csvInput.length);
+
+ if (descriptionPos >= 0) {
+ $scope.csvInput = $scope.csvInput.substring(0, lineStart) + $scope.csvInput.substring(lineEnd, $scope.csvInput.length);
+ }
+ else {
+ console.log("Could not find string: " + line[3]);
+ }
});
}
diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
index f4b3024..7b0dd77 100644
--- a/src/main/resources/static/index.html
+++ b/src/main/resources/static/index.html
@@ -36,6 +36,8 @@
+
+
diff --git a/src/main/resources/static/manifest.webmanifest b/src/main/resources/static/manifest.webmanifest
index 8a8b2c5..8636d04 100644
--- a/src/main/resources/static/manifest.webmanifest
+++ b/src/main/resources/static/manifest.webmanifest
@@ -1,5 +1,5 @@
{
- "background_color": "#50a7bd",
+ "background_color": "#ebebeb",
"description": "Ausgaben",
"display": "standalone",
"icons": [
diff --git a/src/main/resources/static/public/apple-touch-icon.png b/src/main/resources/static/public/apple-touch-icon.png
deleted file mode 100644
index 4e41874..0000000
Binary files a/src/main/resources/static/public/apple-touch-icon.png and /dev/null differ
diff --git a/src/main/resources/transactions-icon.svg b/src/main/resources/transactions-icon.svg
index 03b9260..b2274f2 100644
--- a/src/main/resources/transactions-icon.svg
+++ b/src/main/resources/transactions-icon.svg
@@ -2270,7 +2270,10 @@
+ clip-path="url(#clipPath4466)"
+ inkscape:export-filename="/home/tilman/git/next-transactions/src/main/resources/static/public/icon-grey.png"
+ inkscape:export-xdpi="289.38617"
+ inkscape:export-ydpi="289.38617">