tilman/next-transactions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix for import, improved web app

Browse Source
This commit is contained in:
Tilman
2021-10-03 20:40:37 +02:00
parent bad3e50dbb
commit d16f13e031
7 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+1 -1
View File
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>de.tilman</groupId> <groupId>de.tilman</groupId>
<artifactId>next-transactions</artifactId> <artifactId>next-transactions</artifactId>
<version>1.8</version> <version>1.9</version>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
src/main/java/de/tilman/transactions/SecurityConfiguration.java
+4 -4
View File
@@ -21,12 +21,12 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
@Override @Override
protected void configure(AuthenticationManagerBuilder auth) throws Exception { protected void configure(AuthenticationManagerBuilder auth) throws Exception {
auth.inMemoryAuthentication() auth.inMemoryAuthentication()
.withUser("adam").password("test").roles("USER", "ADMIN").and() // .withUser("adam").password("test").roles("USER", "ADMIN").and()
.withUser("betty").password("test").roles("USER"); // .withUser("betty").password("test").roles("USER");
// SET PASSWORDS FOR PRODUCTION // SET PASSWORDS FOR PRODUCTION
// .withUser("tilman").password(XXX).roles("USER", "ADMIN").and() .withUser("tilman").password(XXX).roles("USER", "ADMIN").and()
// .withUser("anica").password(XXX).roles("USER"); .withUser("anica").password(XXX).roles("USER");
} }
@Override @Override
src/main/resources/static/app/controllers.js
+11 -2
View File
@@ -561,12 +561,21 @@ transactionControllers.controller('ImportListCtrl', [ '$scope', '$resource', '$l
line.submittedTransactionId = transaction.id; line.submittedTransactionId = transaction.id;
// delete from CSV // 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 lineStart = $scope.csvInput.lastIndexOf('\n', descriptionPos);
var lineEnd = $scope.csvInput.indexOf('\n', descriptionPos); var lineEnd = $scope.csvInput.indexOf('\n', descriptionPos);
if (lineEnd < 0) if (lineEnd < 0)
lineEnd = $scope.csvInput.length; 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]);
}
}); });
} }
src/main/resources/static/index.html
+2
View File
@@ -36,6 +36,8 @@
<link rel="icon" type="image/png" sizes="196x196" href="/public/icon-grey.png"> <link rel="icon" type="image/png" sizes="196x196" href="/public/icon-grey.png">
<link rel="shortcut icon" href="/public/favicon.ico"> <link rel="shortcut icon" href="/public/favicon.ico">
<!-- see https://developer.mozilla.org/en-US/docs/Web/Progressive_web_apps/Add_to_home_screen -->
<!-- see https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes/crossorigin -->
<link rel="manifest" href="manifest.webmanifest" crossorigin="use-credentials"> <link rel="manifest" href="manifest.webmanifest" crossorigin="use-credentials">
</head> </head>
<body> <body>
src/main/resources/static/manifest.webmanifest
+1 -1
View File
@@ -1,5 +1,5 @@
{ {
"background_color": "#50a7bd", "background_color": "#ebebeb",
"description": "Ausgaben", "description": "Ausgaben",
"display": "standalone", "display": "standalone",
"icons": [ "icons": [
src/main/resources/static/public/apple-touch-icon.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 23 KiB

src/main/resources/transactions-icon.svg
+4 -1
View File
@@ -2270,7 +2270,10 @@
</g> </g>
<g <g
id="g4464" id="g4464"
clip-path="url(#clipPath4466)"> 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">
<circle <circle
r="8.426115" r="8.426115"
cy="140.04596" cy="140.04596"
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 163 KiB

After

Width:  |  Height:  |  Size: 163 KiB