Skip to content
Snippets Groups Projects
Commit 9e7433e7 authored by Janis Daniel Dähne's avatar Janis Daniel Dähne
Browse files

- removing lang is not longer supported (not possible to fully edit this through ui)

parent b2bf4f16
Branches
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/ClientServer/Config/Constants.cs
+ 1
− 1
View file @ 9e7433e7
......@@ -13,7 +13,7 @@ namespace ClientServer.Helpers
/// </summary>
public static class Constants
{
public static string VersionString = "2.2.7";
public static string VersionString = "2.2.8";
/// <summary>
/// the port to use
......
src/ClientServer/Controllers/Core/Misc/LangController.cs
+ 106
− 99
View file @ 9e7433e7
......@@ -72,30 +72,33 @@ namespace ClientServer.Controllers.Core.Exercises
if (!await base.IsLoggedIn()) return;
if (!await this._CheckPermission()) return;
var newLang = new Lang()
{
Language = lang.DisplayName,
LangShortcut = lang.LangShortcut
};
try
{
_context.Langs.Add(newLang);
await _context.SaveChangesAsync();
}
catch (Exception e)
{
await base.HandleDbError(e);
return;
}
lang.Id = newLang.Id;
await
Response.WriteAsync(Jc.Serialize(new BasicResponseWithData<LangFullBase>(ResponseCode.Ok,
"", lang)));
Response.WriteAsync(Jc.Serialize(new BasicResponse(ResponseCode.ServerError, "not supported yet")));
// var newLang = new Lang()
// {
// Language = lang.DisplayName,
// LangShortcut = lang.LangShortcut
// };
//
// try
// {
// _context.Langs.Add(newLang);
// await _context.SaveChangesAsync();
// }
// catch (Exception e)
// {
// await base.HandleDbError(e);
// return;
// }
//
//
// lang.Id = newLang.Id;
//
// await
// Response.WriteAsync(Jc.Serialize(new BasicResponseWithData<LangFullBase>(ResponseCode.Ok,
// "", lang)));
}
/// <summary>
......@@ -110,35 +113,36 @@ namespace ClientServer.Controllers.Core.Exercises
if (!await this._CheckPermission()) return;
var oldLang = await _context.Langs.FirstOrDefaultAsync(p => p.Id == lang.Id);
if (oldLang == null)
{
await
Response.WriteAsync(Jc.Serialize(new BasicResponse(ResponseCode.NotFound, "language not found")));
return;
}
oldLang.Language = lang.DisplayName;
oldLang.LangShortcut = lang.LangShortcut;
try
{
await _context.SaveChangesAsync();
}
catch (Exception e)
{
await base.HandleDbError(e);
return;
}
await
Response.WriteAsync(Jc.Serialize(new BasicResponseWithData<LangFullBase>(ResponseCode.Ok,
"", lang)));
Response.WriteAsync(Jc.Serialize(new BasicResponse(ResponseCode.ServerError, "not supported yet")));
// var oldLang = await _context.Langs.FirstOrDefaultAsync(p => p.Id == lang.Id);
//
//
// if (oldLang == null)
// {
// await
// Response.WriteAsync(Jc.Serialize(new BasicResponse(ResponseCode.NotFound, "language not found")));
// return;
// }
//
//
// oldLang.Language = lang.DisplayName;
// oldLang.LangShortcut = lang.LangShortcut;
//
// try
// {
// await _context.SaveChangesAsync();
// }
// catch (Exception e)
// {
// await base.HandleDbError(e);
// return;
// }
//
// await
// Response.WriteAsync(Jc.Serialize(new BasicResponseWithData<LangFullBase>(ResponseCode.Ok,
// "", lang)));
}
[HttpDelete("delete/{langId}")]
......@@ -149,55 +153,58 @@ namespace ClientServer.Controllers.Core.Exercises
if (!await this._CheckPermission()) return;
var oldLang = await _context.Langs
.FirstOrDefaultAsync(p => p.Id == langId);
if (oldLang == null)
{
await
Response.WriteAsync(Jc.Serialize(new BasicResponse(ResponseCode.NotFound, "language not found")));
return;
}
await semaphoreSlim.WaitAsync();
try
{
//we need at least one language...
var canDelete = false;
var langCount = _context.Langs.Count();
if (langCount > 1)
{
canDelete = true;
}
if (canDelete == false)
{
await
Response.WriteAsync(Jc.Serialize(new BasicResponse(ResponseCode.InvalidRequest,
"at least one language is needed")));
return;
}
_context.Langs.Remove(oldLang);
await _context.SaveChangesAsync();
}
catch (Exception e)
{
await base.HandleDbError(e);
return;
}
finally
{
semaphoreSlim.Release();
}
await Response.WriteAsync(Jc.Serialize(new BasicResponse(ResponseCode.Ok, "")));
await
Response.WriteAsync(Jc.Serialize(new BasicResponse(ResponseCode.ServerError, "not supported yet")));
// var oldLang = await _context.Langs
// .FirstOrDefaultAsync(p => p.Id == langId);
//
// if (oldLang == null)
// {
// await
// Response.WriteAsync(Jc.Serialize(new BasicResponse(ResponseCode.NotFound, "language not found")));
// return;
// }
//
//
// await semaphoreSlim.WaitAsync();
//
// try
// {
// //we need at least one language...
// var canDelete = false;
//
// var langCount = _context.Langs.Count();
//
// if (langCount > 1)
// {
// canDelete = true;
// }
//
// if (canDelete == false)
// {
// await
// Response.WriteAsync(Jc.Serialize(new BasicResponse(ResponseCode.InvalidRequest,
// "at least one language is needed")));
// return;
// }
//
// _context.Langs.Remove(oldLang);
//
// await _context.SaveChangesAsync();
// }
// catch (Exception e)
// {
// await base.HandleDbError(e);
// return;
// }
// finally
// {
// semaphoreSlim.Release();
// }
//
//
// await Response.WriteAsync(Jc.Serialize(new BasicResponse(ResponseCode.Ok, "")));
}
}
......
src/ClientServer/appsettings.json
+ 4
− 8
View file @ 9e7433e7
......@@ -7,19 +7,15 @@
"Microsoft": "Information"
}
},
"TestServerUrl": "http://localhost:8081/api.php",
"SubmitTestServerUrl": "http://localhost:8081/api.php",
"TestServerStatsUrl": "http://localhost:8081/api.php",
"IsDebugMode": true,
"IsDbBootstrapEnabled": false,
"DbConnectionString": "Username=syndrom;Password=janis;Host=localhost;Database=SyndromDb;Pooling=true",
"SystemSalt": "NeverChangeThisAfterFirstStartup",
"ExternalLoginUrl": "https://uebungsportal.informatik.uni-halle.de/ostepu/DB/DBTransaction/transaction/authentication/redirect/transaction/",
"MainEntrySite": "/",
"LoginExternalFirstTimeSite": "/firstLoginExternalLogin.html",
"RunAssessmentsAsync": false,
"MaxNumberOfTestsWithOneRequest": 5,
"MaxNumberOfTestsWithOneRequestSubmitTestServer": 15,
"TestServerTimeoutInMs": 7000,
"SubmitTestServerTimeoutInMs": 18000,
"RunAssessmentsAsync": false,
"DashboardScriptPathRelativeToCurrentDir": "dashboard.php",
"DebugOriginUrl": "http://localhost:8080",
"DeployOriginUrls": ["https://yapex.informatik.uni-halle.de"],
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment