forked from MDCPS/DamageAssessment_Backend
completed heatmap api changes for location and response api
This commit is contained in:
@ -8,5 +8,9 @@
|
||||
public string Name { get; set; }
|
||||
public string MaintenanceCenter { get; set; }
|
||||
public string SchoolType { get; set; }
|
||||
public int? DataValue { get; set; }
|
||||
public int? Enrollment { get; set; }
|
||||
public double? Longitute { get; set; }
|
||||
public double? Latitude { get; set; }
|
||||
}
|
||||
}
|
||||
|
@ -512,17 +512,19 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
var allQuestions = await questionServiceProvider.getQuestionsAsync(null);
|
||||
var questions = allQuestions.Where(s => s.SurveyId == surveyResponse.SurveyId);
|
||||
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
||||
|
||||
var result = new
|
||||
{
|
||||
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||
var location = Locations.Where(a => a.Id == surveyResponse.LocationId).FirstOrDefault();
|
||||
var result = new{
|
||||
surveyResponse.Id,
|
||||
surveyResponse.SurveyId,
|
||||
surveyResponse.LocationId,
|
||||
surveyResponse.EmployeeId,
|
||||
surveyResponse.ClientDevice,
|
||||
surveyResponse.KeyAnswerResult,
|
||||
surveyResponse.Longitute,
|
||||
surveyResponse.Latitude,
|
||||
DataValue=(location!=null?location.DataValue:0),
|
||||
Enrollment= (location != null ? location.Enrollment : 0),
|
||||
Longitute = (location != null ? location.Longitute : surveyResponse.Longitute),
|
||||
Latitude=(location != null ? location.Latitude : surveyResponse.Latitude),
|
||||
Employee = employee,
|
||||
answers = from ans in answers
|
||||
select new
|
||||
@ -566,6 +568,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
|
||||
var answers = await answerServiceProvider.getAnswersAsync();
|
||||
var questions = await questionServiceProvider.getQuestionsAsync(null);
|
||||
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||
var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
|
||||
|
||||
//var surveyQuestions = await questionServiceProvider.getSurveyQuestionsAsync(surveyId);
|
||||
@ -575,6 +578,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
if (employeeid == 0)
|
||||
{
|
||||
var result = from r in surveyResonses
|
||||
join loc in Locations on r.LocationId equals loc.Id
|
||||
select new
|
||||
{
|
||||
r.Id,
|
||||
@ -583,8 +587,10 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
r.KeyAnswerResult,
|
||||
r.Longitute,
|
||||
r.Latitude,
|
||||
loc.DataValue,
|
||||
loc.Enrollment,
|
||||
loc.Longitute,
|
||||
loc.Latitude,
|
||||
Employee = (from e in employees where e.Id == r.EmployeeId select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||
answers = from ans in answers
|
||||
where ans.SurveyResponseId == r.Id
|
||||
@ -609,6 +615,7 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
_employee = new { employee.Id, employee.Name, employee.BirthDate, employee.Email, employee.OfficePhoneNumber };
|
||||
}
|
||||
var result = from r in surveyResonses
|
||||
join loc in Locations on r.LocationId equals loc.Id
|
||||
select new
|
||||
{
|
||||
r.Id,
|
||||
@ -617,8 +624,10 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
r.KeyAnswerResult,
|
||||
r.Longitute,
|
||||
r.Latitude,
|
||||
loc.DataValue,
|
||||
loc.Enrollment,
|
||||
loc.Longitute,
|
||||
loc.Latitude,
|
||||
Employee = _employee,
|
||||
answers = from ans in answers
|
||||
where ans.SurveyResponseId == r.Id
|
||||
@ -674,7 +683,9 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
var questions = await questionServiceProvider.getQuestionsAsync(null);
|
||||
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
||||
|
||||
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||
var result = from r in surveyResonses
|
||||
join loc in Locations on r.LocationId equals loc.Id
|
||||
select new
|
||||
{
|
||||
r.Id,
|
||||
@ -683,8 +694,10 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
r.KeyAnswerResult,
|
||||
r.Longitute,
|
||||
r.Latitude,
|
||||
loc.DataValue,
|
||||
loc.Enrollment,
|
||||
loc.Longitute,
|
||||
loc.Latitude,
|
||||
Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||
answers = from ans in answers
|
||||
where ans.SurveyResponseId == r.Id
|
||||
@ -938,7 +951,9 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
var surveyQuestions = from q in questions where q.SurveyId == surveyId select q;
|
||||
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
||||
|
||||
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||
var result = from r in surveyResonses
|
||||
join loc in Locations on r.LocationId equals loc.Id
|
||||
select new
|
||||
{
|
||||
r.Id,
|
||||
@ -947,8 +962,10 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
r.KeyAnswerResult,
|
||||
r.Longitute,
|
||||
r.Latitude,
|
||||
loc.DataValue,
|
||||
loc.Enrollment,
|
||||
loc.Longitute,
|
||||
loc.Latitude,
|
||||
Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||
answers = from ans in answers
|
||||
where ans.SurveyResponseId == r.Id
|
||||
@ -1004,8 +1021,9 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
// var employees = await employeeServiceProvider.getEmployeesAsync();
|
||||
var answers = await answerServiceProvider.getAnswersAsync();
|
||||
var attachments = await attachmentServiceProvider.getAttachmentsAsync();
|
||||
|
||||
var Locations = await locationServiceProvider.getLocationsAsync();
|
||||
var result = from r in surveyResponses
|
||||
join loc in Locations on r.LocationId equals loc.Id
|
||||
select new
|
||||
{
|
||||
r.Id,
|
||||
@ -1014,8 +1032,10 @@ namespace DamageAssesment.Api.Responses.Providers
|
||||
r.EmployeeId,
|
||||
r.ClientDevice,
|
||||
r.KeyAnswerResult,
|
||||
r.Longitute,
|
||||
r.Latitude,
|
||||
loc.DataValue,
|
||||
loc.Enrollment,
|
||||
loc.Longitute,
|
||||
loc.Latitude,
|
||||
Employee = employeeid != 0 ? _employee : (from e in employees where r.EmployeeId == e.Id select new { e.Id, e.Name, e.BirthDate, e.Email, e.OfficePhoneNumber }).SingleOrDefault(),
|
||||
answers = from ans in answers
|
||||
where ans.SurveyResponseId == r.Id
|
||||
|
Reference in New Issue
Block a user