This commit is contained in:
oleting
2021-01-17 12:12:18 +00:00
parent 999e56d35f
commit 88a6a208d9
5 changed files with 39 additions and 11 deletions

View File

@@ -1,7 +1,7 @@
from os import stat
from interpreter.interpret_source import Function_scope
from typing import Dict, List, Optional
from PySimpleGUI import one_line_progress_meter
# from PySimpleGUI import one_line_progress_meter
import logging
from enum import IntEnum
import os.path
@@ -29,7 +29,7 @@ class NassiShneidermanDiagram:
logLevel = logging.INFO
if debug:
logLevel = logging.DEBUG
logging.basicConfig(force=True, level=logLevel)
@staticmethod

View File

@@ -289,7 +289,7 @@ class JavaInterpreter:
brace_offset = self._get_scope_start_offset(idx)
return self._get_instructions_in_scope(idx+brace_offset)[0]
def _get_function_scope(self, match: re.Match[str]):
def _get_function_scope(self, match: Match[str]):
span = match.span()
header = self.src[span[0]:span[1]].replace('\n', '')

View File

@@ -5,8 +5,8 @@ from flask_wtf.file import FileAllowed
from wtforms.fields.core import StringField
class UploadJavaForm(FlaskForm):
comments = StringField('Enter customn comments (//, #, ...): ', validators=(Optional()))
types = StringField('custom types (//, #, ...)', validators=(Optional()))
remove_tags = StringField('Enter customn modifier (public, private, ...): ', validators=(Optional()))
comments = StringField('Enter customn comments (//, #, ...): ', validators=([Optional(),]))
types = StringField('custom types (//, #, ...)', validators=([Optional(),]))
remove_tags = StringField('Enter customn modifier (public, private, ...): ', validators=([Optional(),]))
java = FileField('.java hochladen', validators=[FileAllowed(['java', 'txt'])])
submit = SubmitField('Bestätigen')

View File

@@ -4,7 +4,7 @@
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
@@ -15,7 +15,7 @@
{% else %}
<title>NassiShneiderman Generator</title>
{% endif %}
</head>
<body>
<header class="site-header">
@@ -27,12 +27,12 @@
</button>
<div class="collapse navbar-collapse" id="navbarToggle">
<div class="navbar-nav mr-auto">
<a class="nav-item nav-link" href="http://nassi.ole-siepmann.de">Home</a>
<a class="nav-item nav-link" href="http://oleting.pythonanywhere.com/">Home</a>
<a class="nav-item nav-link" href="https://ole-siepmann.de/startseite/datenschutzerklaerung/">Datenschutz</a>
</div>
<!-- Navbar Right Side -->
<div class="navbar-nav">
</div>
</div>
</div>
@@ -43,7 +43,7 @@
<div class="row">
<div class="col-md-8">
{% with messages = get_flashed_messages(with_categories=true) %}
{% if messages %}
{% if messages %}
{% for category, message in messages %}
<div class="alert alert-{{ category }}">
{{message}}

View File

@@ -14,6 +14,34 @@
<form method='Post' action='' enctype="multipart/form-data">
{{ form.hidden_tag() }}
<fieldset class="form-group">
<div class="form-group">
{{ form.comments.label() }}
{{ form.comments(class="form-control-file") }}
{% if form.comments.errors %}
{% for error in form.comments.errors %}
<span class="text-danger">{{ error }}</span></br>
{% endfor %}
{% endif %}
</div>
<div class="form-group">
{{ form.types.label() }}
{{ form.types(class="form-control-file") }}
{% if form.types.errors %}
{% for error in form.types.errors %}
<span class="text-danger">{{ error }}</span></br>
{% endfor %}
{% endif %}
</div>
<div class="form-group">
{{ form.remove_tags.label() }}
{{ form.remove_tags(class="form-control-file") }}
{% if form.remove_tags.errors %}
{% for error in form.remove_tags.errors %}
<span class="text-danger">{{ error }}</span></br>
{% endfor %}
{% endif %}
</div>
<legend class="border-bottom mb-4">.java Datei hochladen:</legend>
<div class="form-group">
{{ form.java.label() }}