thooge
/
OpenAntrag
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: thooge:raven4
Branches Tags
thooge:master
thooge:raven4
..
compare: thooge:master
Branches Tags
thooge:master
thooge:raven4

No commits in common. 'raven4' and 'master' have entirely different histories.
raven4 ... master

18 changed files with 888 additions and 532 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats
  1. 1097
      OpenAntrag/App_Data/piratenmandate.xml
  2. 8
      OpenAntrag/My Project/Application.Designer.vb
  3. 26
      OpenAntrag/My Project/Resources.Designer.vb
  4. 14
      OpenAntrag/My Project/Settings.Designer.vb
  5. 81
      OpenAntrag/OpenAntrag.vbproj
  6. 10
      OpenAntrag/Views/Web.config
  7. 17
      OpenAntragLib/Attributes/HandleCustomErrorAttribute.vb
  8. 30
      OpenAntragLib/Controller/CommonController.vb
  9. 11
      OpenAntragLib/Helper/MarkdownHelper.vb
  10. 6
      OpenAntragLib/Helper/PartialHelper.vb
  11. 9
      OpenAntragLib/Models/Proposal/Proposals.vb
  12. 7
      OpenAntragLib/Models/Representation/RepresentationSetting.vb
  13. 13
      OpenAntragLib/Models/Representation/piratenmandate.vb
  14. 8
      OpenAntragLib/My Project/Application.Designer.vb
  15. 26
      OpenAntragLib/My Project/Resources.Designer.vb
  16. 14
      OpenAntragLib/My Project/Settings.Designer.vb
  17. 12
      OpenAntragLib/OpenAntragLib.vbproj
  18. 31
      OpenAntragLib/app.config

1097
OpenAntrag/App_Data/piratenmandate.xml
View File

File diff suppressed because it is too large Load Diff

8
OpenAntrag/My Project/Application.Designer.vb generated
Unescape View File

@ -1,10 +1,10 @@
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------
' <auto-generated> ' <auto-generated>
' Dieser Code wurde von einem Tool generiert. ' This code was generated by a tool.
' Laufzeitversion:4.0.30319.42000 ' Runtime Version:4.0.30319.18444
' '
' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn ' Changes to this file may cause incorrect behavior and will be lost if
' der Code erneut generiert wird. ' the code is regenerated.
' </auto-generated> ' </auto-generated>
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------

26
OpenAntrag/My Project/Resources.Designer.vb generated
Unescape View File

@ -1,10 +1,10 @@
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------
' <auto-generated> ' <auto-generated>
' Dieser Code wurde von einem Tool generiert. ' This code was generated by a tool.
' Laufzeitversion:4.0.30319.42000 ' Runtime Version:4.0.30319.18444
' '
' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn ' Changes to this file may cause incorrect behavior and will be lost if
' der Code erneut generiert wird. ' the code is regenerated.
' </auto-generated> ' </auto-generated>
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------
@ -15,14 +15,14 @@ Imports System
Namespace My.Resources Namespace My.Resources
'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert 'This class was auto-generated by the StronglyTypedResourceBuilder
'-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. 'class via a tool like ResGen or Visual Studio.
'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen 'To add or remove a member, edit your .ResX file then rerun ResGen
'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. 'with the /str option, or rebuild your VS project.
'''<summary> '''<summary>
''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' A strongly-typed resource class, for looking up localized strings, etc.
'''</summary> '''</summary>
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"), _ <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _ Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _ Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _ Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
@ -33,7 +33,7 @@ Namespace My.Resources
Private resourceCulture As Global.System.Globalization.CultureInfo Private resourceCulture As Global.System.Globalization.CultureInfo
'''<summary> '''<summary>
''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. ''' Returns the cached ResourceManager instance used by this class.
'''</summary> '''</summary>
<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
@ -47,8 +47,8 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle ''' Overrides the current thread's CurrentUICulture property for all
''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. ''' resource lookups using this strongly typed resource class.
'''</summary> '''</summary>
<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Friend Property Culture() As Global.System.Globalization.CultureInfo Friend Property Culture() As Global.System.Globalization.CultureInfo

14
OpenAntrag/My Project/Settings.Designer.vb generated
Unescape View File

@ -1,10 +1,10 @@
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------
' <auto-generated> ' <auto-generated>
' Dieser Code wurde von einem Tool generiert. ' This code was generated by a tool.
' Laufzeitversion:4.0.30319.42000 ' Runtime Version:4.0.30319.18444
' '
' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn ' Changes to this file may cause incorrect behavior and will be lost if
' der Code erneut generiert wird. ' the code is regenerated.
' </auto-generated> ' </auto-generated>
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------
@ -15,21 +15,21 @@ Option Explicit On
Namespace My Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _ <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"), _ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class MySettings Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase Inherits Global.System.Configuration.ApplicationSettingsBase
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
#Region "Automatische My.Settings-Speicherfunktion" #Region "My.Settings Auto-Save Functionality"
#If _MyType = "WindowsForms" Then #If _MyType = "WindowsForms" Then
Private Shared addedHandler As Boolean Private Shared addedHandler As Boolean
Private Shared addedHandlerLockObject As New Object Private Shared addedHandlerLockObject As New Object
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
If My.Application.SaveMySettingsOnExit Then If My.Application.SaveMySettingsOnExit Then
My.Settings.Save() My.Settings.Save()
End If End If

81
OpenAntrag/OpenAntrag.vbproj
Unescape View File

@ -12,7 +12,7 @@
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<RootNamespace>OpenAntrag</RootNamespace> <RootNamespace>OpenAntrag</RootNamespace>
<AssemblyName>OpenAntrag</AssemblyName> <AssemblyName>OpenAntrag</AssemblyName>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<OptionExplicit>On</OptionExplicit> <OptionExplicit>On</OptionExplicit>
<OptionCompare>Binary</OptionCompare> <OptionCompare>Binary</OptionCompare>
<OptionStrict>Off</OptionStrict> <OptionStrict>Off</OptionStrict>
@ -28,8 +28,6 @@
<SccAuxPath>SAK</SccAuxPath> <SccAuxPath>SAK</SccAuxPath>
<SccProvider>SAK</SccProvider> <SccProvider>SAK</SccProvider>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
<Use64BitIISExpress />
<UseGlobalApplicationHostFile />
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
@ -73,9 +71,8 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll</HintPath> <HintPath>packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll</HintPath>
</Reference> </Reference>
<Reference Include="MarkdownDeep, Version=1.5.4615.26275, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="MarkdownDeep">
<SpecificVersion>False</SpecificVersion> <HintPath>packages\MarkdownDeep.Full.1.5\lib\.NetFramework 3.5\MarkdownDeep.dll</HintPath>
<HintPath>packages\MarkdownDeep.NET.1.5\lib\.NetFramework 3.5\MarkdownDeep.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private> <Private>True</Private>
@ -241,10 +238,6 @@
<Content Include="App_Data\piratenmandate.xml"> <Content Include="App_Data\piratenmandate.xml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Content> </Content>
<Content Include="App_Data\Representations.xml">
<SubType>Designer</SubType>
</Content>
<Content Include="App_Data\Users.xml" />
<Content Include="Content\domain.css" /> <Content Include="Content\domain.css" />
<Content Include="Content\error.css" /> <Content Include="Content\error.css" />
<Content Include="Content\faq.css" /> <Content Include="Content\faq.css" />
@ -450,41 +443,41 @@
<Content Include="Images\Logos\OALogo50.png" /> <Content Include="Images\Logos\OALogo50.png" />
<Content Include="Images\Logos\PPLogo315.png" /> <Content Include="Images\Logos\PPLogo315.png" />
<Content Include="Images\Logos\PPLogo50.png" /> <Content Include="Images\Logos\PPLogo50.png" />
<Content Include="Images\Map\200-BB-active.png" /> <Content Include="Images\Map\200-BB-blue.png" />
<Content Include="Images\Map\200-BB-inactive.png" /> <Content Include="Images\Map\200-BB-orange.png" />
<Content Include="Images\Map\200-BE-active.png" /> <Content Include="Images\Map\200-BE-blue.png" />
<Content Include="Images\Map\200-BE-inactive.png" /> <Content Include="Images\Map\200-BE-orange.png" />
<Content Include="Images\Map\200-BW-active.png" /> <Content Include="Images\Map\200-BW-blue.png" />
<Content Include="Images\Map\200-BW-inactive.png" /> <Content Include="Images\Map\200-BW-orange.png" />
<Content Include="Images\Map\200-BY-active.png" /> <Content Include="Images\Map\200-BY-blue.png" />
<Content Include="Images\Map\200-BY-inactive.png" /> <Content Include="Images\Map\200-BY-orange.png" />
<Content Include="Images\Map\200-DE-gray.png" /> <Content Include="Images\Map\200-DE-gray.png" />
<Content Include="Images\Map\200-DE-white.png" /> <Content Include="Images\Map\200-DE-white.png" />
<Content Include="Images\Map\200-DE.png" /> <Content Include="Images\Map\200-DE.png" />
<Content Include="Images\Map\200-HB-active.png" /> <Content Include="Images\Map\200-HB-blue.png" />
<Content Include="Images\Map\200-HB-inactive.png" /> <Content Include="Images\Map\200-HB-orange.png" />
<Content Include="Images\Map\200-HE-active.png" /> <Content Include="Images\Map\200-HE-blue.png" />
<Content Include="Images\Map\200-HE-inactive.png" /> <Content Include="Images\Map\200-HE-orange.png" />
<Content Include="Images\Map\200-HH-active.png" /> <Content Include="Images\Map\200-HH-blue.png" />
<Content Include="Images\Map\200-HH-inactive.png" /> <Content Include="Images\Map\200-HH-orange.png" />
<Content Include="Images\Map\200-MV-active.png" /> <Content Include="Images\Map\200-MV-blue.png" />
<Content Include="Images\Map\200-MV-inactive.png" /> <Content Include="Images\Map\200-MV-orange.png" />
<Content Include="Images\Map\200-NI-active.png" /> <Content Include="Images\Map\200-NI-blue.png" />
<Content Include="Images\Map\200-NI-inactive.png" /> <Content Include="Images\Map\200-NI-orange.png" />
<Content Include="Images\Map\200-NW-active.png" /> <Content Include="Images\Map\200-NW-blue.png" />
<Content Include="Images\Map\200-NW-inactive.png" /> <Content Include="Images\Map\200-NW-orange.png" />
<Content Include="Images\Map\200-RP-active.png" /> <Content Include="Images\Map\200-RP-blue.png" />
<Content Include="Images\Map\200-RP-inactive.png" /> <Content Include="Images\Map\200-RP-orange.png" />
<Content Include="Images\Map\200-SH-active.png" /> <Content Include="Images\Map\200-SH-blue.png" />
<Content Include="Images\Map\200-SH-inactive.png" /> <Content Include="Images\Map\200-SH-orange.png" />
<Content Include="Images\Map\200-SL-active.png" /> <Content Include="Images\Map\200-SL-blue.png" />
<Content Include="Images\Map\200-SL-inactive.png" /> <Content Include="Images\Map\200-SL-orange.png" />
<Content Include="Images\Map\200-SN-active.png" /> <Content Include="Images\Map\200-SN-blue.png" />
<Content Include="Images\Map\200-SN-inactive.png" /> <Content Include="Images\Map\200-SN-orange.png" />
<Content Include="Images\Map\200-ST-active.png" /> <Content Include="Images\Map\200-ST-blue.png" />
<Content Include="Images\Map\200-ST-inactive.png" /> <Content Include="Images\Map\200-ST-orange.png" />
<Content Include="Images\Map\200-TH-active.png" /> <Content Include="Images\Map\200-TH-blue.png" />
<Content Include="Images\Map\200-TH-inactive.png" /> <Content Include="Images\Map\200-TH-orange.png" />
<Content Include="Images\Map\_40-DE.png" /> <Content Include="Images\Map\_40-DE.png" />
<Content Include="Images\mCSB_buttons.png" /> <Content Include="Images\mCSB_buttons.png" />
<Content Include="Images\pattern.png" /> <Content Include="Images\pattern.png" />
@ -679,8 +672,8 @@
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<PropertyGroup> <PropertyGroup>
<PreBuildEvent>xcopy /y "C:\Users\Entwicklung\source\repos\piratenmandate\piratenmandate.xml" "$(ProjectDir)App_Data" <PreBuildEvent>xcopy /y "E:\DevProjects\piratenmandate\piratenmandate.xml" "$(ProjectDir)App_Data"
xcopy /y "C:\Users\Entwicklung\source\repos\piratenmandate\piratenmandate.dtd" "$(ProjectDir)App_Data"</PreBuildEvent> xcopy /y "E:\DevProjects\piratenmandate\piratenmandate.dtd" "$(ProjectDir)App_Data"</PreBuildEvent>
</PropertyGroup> </PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

10
OpenAntrag/Views/Web.config
Unescape View File

@ -9,7 +9,7 @@
</configSections> </configSections>
<system.web.webPages.razor> <system.web.webPages.razor>
<host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" /> <host factoryType="System.Web.Mvc.MvcWebRazorHostFactory, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" />
<pages pageBaseType="System.Web.Mvc.WebViewPage"> <pages pageBaseType="System.Web.Mvc.WebViewPage">
<namespaces> <namespaces>
<add namespace="System.Web.Mvc" /> <add namespace="System.Web.Mvc" />
@ -39,11 +39,11 @@
--> -->
<pages <pages
validateRequest="false" validateRequest="false"
pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"> userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
<controls> <controls>
<add assembly="System.Web.Mvc, Version=5.2.2.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" /> <add assembly="System.Web.Mvc, Version=5.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
</controls> </controls>
</pages> </pages>
</system.web> </system.web>

17
OpenAntragLib/Attributes/HandleCustomErrorAttribute.vb
Unescape View File

@ -11,15 +11,16 @@ Public Class HandleCustomErrorAttribute
If New HttpException(Nothing, filterContext.Exception).GetHttpCode() <> 500 Then Return If New HttpException(Nothing, filterContext.Exception).GetHttpCode() <> 500 Then Return
If Not ExceptionType.IsInstanceOfType(filterContext.Exception) Then Return If Not ExceptionType.IsInstanceOfType(filterContext.Exception) Then Return
Dim log As New ErrorLog With { Dim log As New ErrorLog()
.AbsoluteUri = filterContext.HttpContext.Request.Url.AbsoluteUri,
.Controller = filterContext.RouteData.Values("controller").ToString(), log.AbsoluteUri = filterContext.HttpContext.Request.Url.AbsoluteUri
.Action = filterContext.RouteData.Values("action").ToString(), log.Controller = filterContext.RouteData.Values("controller").ToString()
.RequestType = filterContext.HttpContext.Request.RequestType, log.Action = filterContext.RouteData.Values("action").ToString()
.Message = filterContext.Exception.Message, log.RequestType = filterContext.HttpContext.Request.RequestType
.AjaxCall = (filterContext.HttpContext.Request.Headers("X-Requested-With") IsNot Nothing AndAlso log.Message = filterContext.Exception.Message
log.AjaxCall = (filterContext.HttpContext.Request.Headers("X-Requested-With") IsNot Nothing AndAlso
filterContext.HttpContext.Request.Headers("X-Requested-With") = "XMLHttpRequest") filterContext.HttpContext.Request.Headers("X-Requested-With") = "XMLHttpRequest")
}
Dim userAgent As String = filterContext.HttpContext.Request.UserAgent Dim userAgent As String = filterContext.HttpContext.Request.UserAgent

30
OpenAntragLib/Controller/CommonController.vb
Unescape View File

@ -5,20 +5,20 @@ Public Class CommonController
<HandleErrorAsJson()> <HandleErrorAsJson()>
Public Function GetPartial(namepart As String) As JsonResult Public Function GetPartial(namepart As String) As JsonResult
Dim jr As New JsonResult With {
.JsonRequestBehavior = JsonRequestBehavior.AllowGet, Dim jr As New JsonResult
.Data = New With {.success = True, .data = Me.RenderPartialViewToString("_" & namepart & "Partial")} jr.JsonRequestBehavior = JsonRequestBehavior.AllowGet
} jr.Data = New With {.success = True, .data = Me.RenderPartialViewToString("_" & namepart & "Partial")}
Return jr Return jr
End Function End Function
<HandleErrorAsJson()> <HandleErrorAsJson()>
Public Function GetPartialModel(namepart As String, model As Object) As JsonResult Public Function GetPartialModel(namepart As String, model As Object) As JsonResult
Dim jr As New JsonResult With {
.JsonRequestBehavior = JsonRequestBehavior.AllowGet, Dim jr As New JsonResult
.Data = New With {.success = True, .data = Me.RenderPartialViewToString("_" & namepart & "Partial", model)} jr.JsonRequestBehavior = JsonRequestBehavior.AllowGet
} jr.Data = New With {.success = True, .data = Me.RenderPartialViewToString("_" & namepart & "Partial", model)}
Return jr Return jr
End Function End Function
@ -29,10 +29,9 @@ Public Class CommonController
Dim cei As New CustomErrorInfo With {.ErrorMessage = strErrorMessage} Dim cei As New CustomErrorInfo With {.ErrorMessage = strErrorMessage}
Dim strHtml As String = Me.RenderPartialViewToString("_ErrorBoxPartial", cei) Dim strHtml As String = Me.RenderPartialViewToString("_ErrorBoxPartial", cei)
Dim jr As New JsonResult With { Dim jr As New JsonResult
.JsonRequestBehavior = JsonRequestBehavior.AllowGet, jr.JsonRequestBehavior = JsonRequestBehavior.AllowGet
.Data = New With {.success = False, .errorHtml = strHtml} jr.Data = New With {.success = False, .errorHtml = strHtml}
}
Return jr Return jr
End Function End Function
@ -42,10 +41,9 @@ Public Class CommonController
Dim strHash As String = Tools.GetMd5(strValue) Dim strHash As String = Tools.GetMd5(strValue)
Dim jr As New JsonResult With { Dim jr As New JsonResult
.JsonRequestBehavior = JsonRequestBehavior.AllowGet, jr.JsonRequestBehavior = JsonRequestBehavior.AllowGet
.Data = New With {.success = True, .data = strHash} jr.Data = New With {.success = True, .data = strHash}
}
Return jr Return jr
End Function End Function

11
OpenAntragLib/Helper/MarkdownHelper.vb
Unescape View File

@ -14,11 +14,12 @@ Public Module MarkdownHelper
''' <returns>The HTML representation of the supplied Markdown.</returns> ''' <returns>The HTML representation of the supplied Markdown.</returns>
Public Function Markdown(ByVal text As String, Public Function Markdown(ByVal text As String,
Optional ByVal bolSafeMode As Boolean = True) As IHtmlString Optional ByVal bolSafeMode As Boolean = True) As IHtmlString
Dim md = New Markdown With {
.ExtraMode = True, Dim md = New Markdown()
.SafeMode = bolSafeMode,
.NewWindowForExternalLinks = True md.ExtraMode = True
} md.SafeMode = bolSafeMode
md.NewWindowForExternalLinks = True
Dim html As String = md.Transform(text) Dim html As String = md.Transform(text)

6
OpenAntragLib/Helper/PartialHelper.vb
Unescape View File

@ -47,10 +47,10 @@ Public Module PartialExtensions
If String.IsNullOrEmpty(partialViewName) Then If String.IsNullOrEmpty(partialViewName) Then
Throw New ArgumentNullException("partialViewName") Throw New ArgumentNullException("partialViewName")
End If End If
Dim dictionary As New ViewDataDictionary(If(viewData, htmlHelper.ViewData))
' we explicitly set the model here so we don't get the current Model as fallback. ' we explicitly set the model here so we don't get the current Model as fallback.
Dim dictionary As New ViewDataDictionary(If(viewData, htmlHelper.ViewData)) With { dictionary.Model = model
.Model = model
}
Dim viewContext As New ViewContext(htmlHelper.ViewContext, htmlHelper.ViewContext.View, dictionary, htmlHelper.ViewContext.TempData, writer) Dim viewContext As New ViewContext(htmlHelper.ViewContext, htmlHelper.ViewContext.View, dictionary, htmlHelper.ViewContext.TempData, writer)
FindPartialView(viewContext, partialViewName, viewEngineCollection).Render(viewContext, writer) FindPartialView(viewContext, partialViewName, viewEngineCollection).Render(viewContext, writer)

9
OpenAntragLib/Models/Proposal/Proposals.vb
Unescape View File

@ -405,11 +405,10 @@ Public Class Proposals
Dim rep As Representation = GlobalData.Representations.GetByKey(keyRepresentation.ToLower) Dim rep As Representation = GlobalData.Representations.GetByKey(keyRepresentation.ToLower)
Dim model As New Proposal(rep) With { Dim model As New Proposal(rep)
.Title = title.StripSpecialCharsForTitle, model.Title = title.StripSpecialCharsForTitle
.Text = text, model.Text = text
.ContactInfo = contactInfo model.ContactInfo = contactInfo
}
If title.StartsWith("TEST:") Or rep.IsTest = True Then If title.StartsWith("TEST:") Or rep.IsTest = True Then
model.IsTest = True model.IsTest = True

7
OpenAntragLib/Models/Representation/RepresentationSetting.vb
Unescape View File

@ -28,10 +28,9 @@ Public Class RepresentationSettings
If query.Count > 0 Then If query.Count > 0 Then
model = query.First() model = query.First()
Else Else
model = New RepresentationSetting With { model = New RepresentationSetting()
.Key = key, model.Key = key
.CreatedBy = HttpContext.Current.User.Identity.Name model.CreatedBy = HttpContext.Current.User.Identity.Name
}
ds.Store(model) ds.Store(model)
ds.SaveChanges() ds.SaveChanges()
End If End If

13
OpenAntragLib/Models/Representation/piratenmandate.vb
Unescape View File

@ -122,13 +122,12 @@ Public Class piratenmandate
Public ReadOnly Property GebietTypeAndName As String Public ReadOnly Property GebietTypeAndName As String
Get Get
Dim lstNoType As New List(Of String) From { Dim lstNoType As New List(Of String)
"kreis", lstNoType.Add("kreis")
"landkreis", lstNoType.Add("landkreis")
"landschaftsverband", lstNoType.Add("landschaftsverband")
"regionalverband", lstNoType.Add("regionalverband")
"kommunalverband besonderer art" lstNoType.Add("kommunalverband besonderer art")
}
If lstNoType.Contains(Me.GebietType.ToLower()) = True Or If lstNoType.Contains(Me.GebietType.ToLower()) = True Or
Me.GebietName.ToLower.Contains("ortsamtsbereich") = True Then Me.GebietName.ToLower.Contains("ortsamtsbereich") = True Then

8
OpenAntragLib/My Project/Application.Designer.vb generated
Unescape View File

@ -1,10 +1,10 @@
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------
' <auto-generated> ' <auto-generated>
' Dieser Code wurde von einem Tool generiert. ' This code was generated by a tool.
' Laufzeitversion:4.0.30319.42000 ' Runtime Version:4.0.30319.18444
' '
' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn ' Changes to this file may cause incorrect behavior and will be lost if
' der Code erneut generiert wird. ' the code is regenerated.
' </auto-generated> ' </auto-generated>
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------

26
OpenAntragLib/My Project/Resources.Designer.vb generated
Unescape View File

@ -1,10 +1,10 @@
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------
' <auto-generated> ' <auto-generated>
' Dieser Code wurde von einem Tool generiert. ' This code was generated by a tool.
' Laufzeitversion:4.0.30319.42000 ' Runtime Version:4.0.30319.18444
' '
' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn ' Changes to this file may cause incorrect behavior and will be lost if
' der Code erneut generiert wird. ' the code is regenerated.
' </auto-generated> ' </auto-generated>
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------
@ -15,14 +15,14 @@ Imports System
Namespace My.Resources Namespace My.Resources
'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert 'This class was auto-generated by the StronglyTypedResourceBuilder
'-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. 'class via a tool like ResGen or Visual Studio.
'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen 'To add or remove a member, edit your .ResX file then rerun ResGen
'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. 'with the /str option, or rebuild your VS project.
'''<summary> '''<summary>
''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' A strongly-typed resource class, for looking up localized strings, etc.
'''</summary> '''</summary>
<Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"), _ <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _ Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _ Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _ Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
@ -33,7 +33,7 @@ Namespace My.Resources
Private resourceCulture As Global.System.Globalization.CultureInfo Private resourceCulture As Global.System.Globalization.CultureInfo
'''<summary> '''<summary>
''' Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird. ''' Returns the cached ResourceManager instance used by this class.
'''</summary> '''</summary>
<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
@ -47,8 +47,8 @@ Namespace My.Resources
End Property End Property
'''<summary> '''<summary>
''' Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle ''' Overrides the current thread's CurrentUICulture property for all
''' Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden. ''' resource lookups using this strongly typed resource class.
'''</summary> '''</summary>
<Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Friend Property Culture() As Global.System.Globalization.CultureInfo Friend Property Culture() As Global.System.Globalization.CultureInfo

14
OpenAntragLib/My Project/Settings.Designer.vb generated
Unescape View File

@ -1,10 +1,10 @@
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------
' <auto-generated> ' <auto-generated>
' Dieser Code wurde von einem Tool generiert. ' This code was generated by a tool.
' Laufzeitversion:4.0.30319.42000 ' Runtime Version:4.0.30319.18444
' '
' Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn ' Changes to this file may cause incorrect behavior and will be lost if
' der Code erneut generiert wird. ' the code is regenerated.
' </auto-generated> ' </auto-generated>
'------------------------------------------------------------------------------ '------------------------------------------------------------------------------
@ -15,21 +15,21 @@ Option Explicit On
Namespace My Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _ <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"), _ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class MySettings Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase Inherits Global.System.Configuration.ApplicationSettingsBase
Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings) Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
#Region "Automatische My.Settings-Speicherfunktion" #Region "My.Settings Auto-Save Functionality"
#If _MyType = "WindowsForms" Then #If _MyType = "WindowsForms" Then
Private Shared addedHandler As Boolean Private Shared addedHandler As Boolean
Private Shared addedHandlerLockObject As New Object Private Shared addedHandlerLockObject As New Object
<Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Private Shared Sub AutoSaveSettings(sender As Global.System.Object, e As Global.System.EventArgs) Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
If My.Application.SaveMySettingsOnExit Then If My.Application.SaveMySettingsOnExit Then
My.Settings.Save() My.Settings.Save()
End If End If

12
OpenAntragLib/OpenAntragLib.vbproj
Unescape View File

@ -10,7 +10,7 @@
<AssemblyName>OpenAntragLib</AssemblyName> <AssemblyName>OpenAntragLib</AssemblyName>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<MyType>Windows</MyType> <MyType>Windows</MyType>
<TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
<SccProjectName>SAK</SccProjectName> <SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath> <SccLocalPath>SAK</SccLocalPath>
<SccAuxPath>SAK</SccAuxPath> <SccAuxPath>SAK</SccAuxPath>
@ -49,10 +49,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="ActionMailer.Net"> <Reference Include="ActionMailer.Net">
<HintPath>..\OpenAntrag\packages\ActionMailer.0.7.4\lib\Net40\ActionMailer.Net.dll</HintPath> <HintPath>packages\ActionMailer.0.7.4\lib\Net40\ActionMailer.Net.dll</HintPath>
</Reference> </Reference>
<Reference Include="ActionMailer.Net.Mvc"> <Reference Include="ActionMailer.Net.Mvc">
<HintPath>..\OpenAntrag\packages\ActionMailer.0.7.4\lib\Net40\ActionMailer.Net.Mvc.dll</HintPath> <HintPath>packages\ActionMailer.0.7.4\lib\Net40\ActionMailer.Net.Mvc.dll</HintPath>
</Reference> </Reference>
<Reference Include="HtmlAgilityPack"> <Reference Include="HtmlAgilityPack">
<HintPath>..\OpenAntrag\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll</HintPath> <HintPath>..\OpenAntrag\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll</HintPath>
@ -61,9 +61,8 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>Libraries\LinqToTwitter.dll</HintPath> <HintPath>Libraries\LinqToTwitter.dll</HintPath>
</Reference> </Reference>
<Reference Include="MarkdownDeep, Version=1.5.4615.26275, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="MarkdownDeep">
<SpecificVersion>False</SpecificVersion> <HintPath>packages\MarkdownDeep.NET.1.5\lib\.NetFramework 3.5\MarkdownDeep.dll</HintPath>
<HintPath>..\OpenAntrag\packages\MarkdownDeep.NET.1.5\lib\.NetFramework 3.5\MarkdownDeep.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>True</Private> <Private>True</Private>
@ -253,6 +252,7 @@
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="app.config" />
<None Include="My Project\Application.myapp"> <None Include="My Project\Application.myapp">
<Generator>MyApplicationCodeGenerator</Generator> <Generator>MyApplicationCodeGenerator</Generator>
<LastGenOutput>Application.Designer.vb</LastGenOutput> <LastGenOutput>Application.Designer.vb</LastGenOutput>

31
OpenAntragLib/app.config
Unescape View File

@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.18.0" newVersion="4.2.18.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.2.2.0" newVersion="5.2.2.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Write Preview
Loading…
Cancel
Save